summaryrefslogtreecommitdiffstats
path: root/xci/nfvi/osa
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-12-28 12:00:08 +0000
committerMarkos Chandras <mchandras@suse.de>2018-01-03 09:53:02 +0000
commitd3116e3182ebae9d40544060a0318cbc382e388c (patch)
tree883283e0f3f6222130d5ae16b0b90aa739d69769 /xci/nfvi/osa
parenta9e1c486d93630a7f1f19ec79b968ba5404bde0e (diff)
xci: Decouple VM distribution from host OS
Introduce a new XCI_DISTRO variable to select the distribution to deploy on the VMs in order to make deployments more flexible and decouple the VM OS selection from the host one. The default value for this new variable is to match the host OS but users can always set it to one of the supported distributions. We can now simply execute the install-ansible.sh script instead of sourcing it in order to keep the environment as clean as possible. Change-Id: Ia74eb0422f983848cde0fb7b220ea1035dfa78bc Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/nfvi/osa')
-rwxr-xr-xxci/nfvi/osa/nfvi-deploy.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/xci/nfvi/osa/nfvi-deploy.sh b/xci/nfvi/osa/nfvi-deploy.sh
index 14577dd5..95462150 100755
--- a/xci/nfvi/osa/nfvi-deploy.sh
+++ b/xci/nfvi/osa/nfvi-deploy.sh
@@ -139,7 +139,7 @@ fi
echo "Info: Verifying database cluster"
echo "-----------------------------------------------------------------------"
# Apply SUSE fix until https://review.openstack.org/508154 is merged
-if [[ ${OS_FAMILY,,} == "suse" ]]; then
+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\""