summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorSachin Prabhu <sprabhu@redhat.com>2020-04-23 11:58:18 +0100
committerMichael Adam <obnox@samba.org>2020-05-07 19:54:20 +0200
commit9e59242522cfcaac1af08e777e95bb7f6645b491 (patch)
treeb805b53b982efccfd70b253c1ac73a1acea71ed6 /vagrant
parentdaf3ca06e8b3f48f87900e5798ba890a079f0e46 (diff)
downloadsamba-integration-9e59242522cfcaac1af08e777e95bb7f6645b491.tar.gz
samba-integration-9e59242522cfcaac1af08e777e95bb7f6645b491.tar.xz
samba-integration-9e59242522cfcaac1af08e777e95bb7f6645b491.zip
Add the nightly samba build to common.prep
These packages are also used by the client node to install the smbtorture commands. Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Diffstat (limited to 'vagrant')
-rw-r--r--vagrant/ansible/roles/common.prep/tasks/main.yml22
-rw-r--r--vagrant/ansible/roles/node.prep/tasks/main.yml21
2 files changed, 22 insertions, 21 deletions
diff --git a/vagrant/ansible/roles/common.prep/tasks/main.yml b/vagrant/ansible/roles/common.prep/tasks/main.yml
index 91e2e2e..ff21052 100644
--- a/vagrant/ansible/roles/common.prep/tasks/main.yml
+++ b/vagrant/ansible/roles/common.prep/tasks/main.yml
@@ -27,3 +27,25 @@
yum:
name: epel-release
state: latest
+
+- name: add copr to get compat-gnutls34 (needed for centos 7)
+ block:
+
+ - name: Install yum copr plugin
+ yum:
+ name: yum-plugin-copr
+ state: latest
+
+ - name: add copr to get compat-gnutls34
+ command: yum -y copr enable sergiomb/SambaAD
+
+ - name: modify copr repo to only use it for compat-gnutls packages
+ lineinfile:
+ dest: /etc/yum.repos.d/_copr_sergiomb-SambaAD.repo
+ line: "includepkgs=compat-gnutls34.* compat-nettle32.*"
+ insertafter: '\[copr:copr.fedorainfracloud.org:sergiomb:SambaAD\]'
+
+ when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
+
+- name: Enable Samba nightly rpms repository
+ command: yum-config-manager --add-repo http://artifacts.ci.centos.org/gluster/nightly-samba/samba-nightly-master.repo
diff --git a/vagrant/ansible/roles/node.prep/tasks/main.yml b/vagrant/ansible/roles/node.prep/tasks/main.yml
index b962a0d..1a18685 100644
--- a/vagrant/ansible/roles/node.prep/tasks/main.yml
+++ b/vagrant/ansible/roles/node.prep/tasks/main.yml
@@ -39,24 +39,3 @@
- firewalld
- libselinux-python
-- name: add copr to get compat-gnutls34 (needed for centos 7)
- block:
-
- - name: Install yum copr plugin
- yum:
- name: yum-plugin-copr
- state: latest
-
- - name: add copr to get compat-gnutls34
- command: yum -y copr enable sergiomb/SambaAD
-
- - name: modify copr repo to only use it for compat-gnutls packages
- lineinfile:
- dest: /etc/yum.repos.d/_copr_sergiomb-SambaAD.repo
- line: "includepkgs=compat-gnutls34.* compat-nettle32.*"
- insertafter: '\[copr:copr.fedorainfracloud.org:sergiomb:SambaAD\]'
-
- when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '7'
-
-- name: Enable Samba nightly rpms repository
- command: yum-config-manager --add-repo http://artifacts.ci.centos.org/gluster/nightly-samba/samba-nightly-master.repo