diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-01-08 10:45:41 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-01-08 10:46:42 +0000 |
| commit | b4a0a044240a09e621f51d1f12f8f02148870c39 (patch) | |
| tree | de587756020d6e3bb88ba34d2e93154b58e4aebb /xci/nfvi | |
| parent | 76da09f4dea888b247dde3852bd895bbf0e4aa20 (diff) | |
xci: nfvi: OSA: Drop SUSE workaround
The upstream patchset has been merged, so drop the SUSE
specific workaround when obtaining the status of the galera
cluster.
Link: https://review.openstack.org/#/c/508154/
Change-Id: Ic990e6939fb794a532caf8af2759969198fa5d3a
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/nfvi')
| -rwxr-xr-x | xci/nfvi/osa/nfvi-deploy.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/xci/nfvi/osa/nfvi-deploy.sh b/xci/nfvi/osa/nfvi-deploy.sh index 95462150..b8637f22 100755 --- a/xci/nfvi/osa/nfvi-deploy.sh +++ b/xci/nfvi/osa/nfvi-deploy.sh @@ -138,13 +138,6 @@ fi #------------------------------------------------------------------------------- echo "Info: Verifying database cluster" echo "-----------------------------------------------------------------------" -# Apply SUSE fix until https://review.openstack.org/508154 is merged -if [[ ${XCI_DISTRO,,} == "opensuse" ]]; then - ssh root@$OPNFV_HOST_IP "set -o pipefail; ansible --ssh-extra-args='-o StrictHostKeyChecking=no' \ - -i releng-xci/.cache/repos/openstack-ansible/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 "set -o pipefail; ansible --ssh-extra-args='-o StrictHostKeyChecking=no' \ -i releng-xci/.cache/repos/openstack-ansible/playbooks/inventory/ galera_container -m shell \ -a \"mysql -h localhost -e \\\"show status like '%wsrep_cluster_%';\\\"\" | tee galera.log" |