Merge changes from topic 'fix-vm-on-jenkins'

* changes:
  xci: xci-deploy.sh: Apply workaround for checking db cluster on SUSE
  xci: playbooks: synchronize-time: Fix service name for openSUSE
  xci: configure-opnfvhost: Do not run 'remove-folders'
  xci: scripts: build-dib-os.sh: Pin diskimage-builder
  xci: configure-opnfvhost: Do not check /etc/ssl/certs on SUSE

5 files changed, 10 insertions, 24 deletions

diff --git a/xci/file/aio/configure-opnfvhost.yml b/xci/file/aio/configure-opnfvhost.yml
index 535b14dc..f25476f9 100644
--- a/xci/file/aio/configure-opnfvhost.yml
+++ b/xci/file/aio/configure-opnfvhost.yml
@@ -1,15 +1,6 @@
 ---
 - hosts: opnfv
   remote_user: root
-  gather_facts: true
-  become: yes
-  vars_files:
-    - ../var/opnfv.yml
-  roles:
-    - role: remove-folders
-
-- hosts: opnfv
-  remote_user: root
   vars_files:
     - ../var/opnfv.yml
   roles:
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index 76f8f06e..3ba2ae12 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -9,19 +9,6 @@
 ##############################################################################
 - hosts: opnfv
   remote_user: root
-  become: yes
-  vars_files:
-    - ../var/flavor-vars.yml
-    - ../var/opnfv.yml
-  pre_tasks:
-    - name: Load distribution variables
-      include_vars:
-        file: ../var/{{ ansible_os_family }}.yml
-  roles:
-    - role: remove-folders
-
-- hosts: opnfv
-  remote_user: root
   vars_files:
     - ../var/flavor-vars.yml
     - ../var/opnfv.yml
@@ -130,6 +117,7 @@
       file:
         path: "/etc/ssl/certs"
         state: directory
+      when: ansible_pkg_mgr != 'zypper'
     - name: create key directory /etc/ssl/private
       file:
         path: "/etc/ssl/private"
diff --git a/xci/playbooks/roles/synchronize-time/tasks/main.yml b/xci/playbooks/roles/synchronize-time/tasks/main.yml
index cc73c447..8f94d33f 100644
--- a/xci/playbooks/roles/synchronize-time/tasks/main.yml
+++ b/xci/playbooks/roles/synchronize-time/tasks/main.yml
@@ -13,7 +13,7 @@
     state: latest
 - name: restart chrony
   service:
-    name: chrony
+    name: "{{ (ansible_pkg_mgr == 'apt') | ternary('chrony', 'chronyd') }}"
     state: restarted
 - name: synchronize time
   shell: "chronyc -a 'burst 4/4' && chronyc -a makestep"
diff --git a/xci/scripts/vm/build-dib-os.sh b/xci/scripts/vm/build-dib-os.sh
index 78eaff2d..a09ee3c6 100755
--- a/xci/scripts/vm/build-dib-os.sh
+++ b/xci/scripts/vm/build-dib-os.sh
@@ -36,7 +36,7 @@ sudo apt-get install -y -q=3 yum yum-utils rpm zypper kpartx python-pip debootst
 
 echo "Installing diskimage-builder"
 
-sudo -H pip install -q -U diskimage-builder
+sudo -H pip install -q diskimage-builder==2.9.0
 
 echo "Removing old files..."
 sudo rm -rf *.qcow2 *.sha256.txt
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 80ff53b6..fd3849be 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -250,6 +250,13 @@ fi
 #-------------------------------------------------------------------------------
 echo "Info: Verifying database cluster"
 echo "-----------------------------------------------------------------------"
+# Apply SUSE fix until https://review.openstack.org/508154 is merged
+if [[ ${OS_FAMILY,,} == "suse" ]]; then
+	ssh root@$OPNFV_HOST_IP "ansible --ssh-extra-args='-o StrictHostKeyChecking=no' \
+		-i $OPENSTACK_OSA_PATH/playbooks/inventory/ galera_container -m shell \
+		-a \"sed -i \\\"s@/var/run/mysqld/mysqld.sock@/var/run/mysql/mysql.sock@\\\" /etc/my.cnf\""
+fi
+
 ssh root@$OPNFV_HOST_IP "ansible --ssh-extra-args='-o StrictHostKeyChecking=no' \
     -i $OPENSTACK_OSA_PATH/playbooks/inventory/ galera_container -m shell \
 	-a \"mysql -h localhost -e \\\"show status like '%wsrep_cluster_%';\\\"\" | tee galera.log"