diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-29 08:27:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 08:27:21 +0000 |
| commit | cfd3a2099c5687e23c80bfdee55127572a39edc9 (patch) | |
| tree | f765aed90587b84960bf4c0f9ae53bc20dcb19e5 /xci/xci-deploy.sh | |
| parent | b1417cb094ec9c546b3230746278942d4c273401 (diff) | |
| parent | 4e376686a539fa08cd0873de6a036f0a096a0066 (diff) | |
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
Diffstat (limited to 'xci/xci-deploy.sh')
| -rwxr-xr-x | xci/xci-deploy.sh | 7 |
1 files changed, 7 insertions, 0 deletions
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" |