From 0d4fc38c569df7a417065fd3094c7477660eb18c Mon Sep 17 00:00:00 2001 From: liyuenan Date: Thu, 20 Oct 2016 10:41:59 +0800 Subject: Edit the docker file and adjust HA yml JIRA: COMPASS-491 Change-Id: Ibca46dca0ca614b9a6e7eb3fe5b9d5c8ca26c006 Signed-off-by: liyuenan --- deploy/compass_vm.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'deploy/compass_vm.sh') diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh index 33e309c0..94b103f0 100755 --- a/deploy/compass_vm.sh +++ b/deploy/compass_vm.sh @@ -53,18 +53,21 @@ function exec_cmd_on_compass() { } function _inject_dashboard_conf() { - if [[ "$ENABLE_UBUNTU_THEME" == "true" ]]; then - cmd=" - sed -i '/enable_ubuntu_theme/d' /etc/compass/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl; \ - echo enable_ubuntu_theme: True >> /etc/compass/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl - " - else - cmd=" - sed -i '/enable_ubuntu_theme/d' /etc/compass/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl; \ - echo enable_ubuntu_theme: False >> /etc/compass/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl - " - fi - exec_cmd_on_compass $cmd + for os in mitaka mitaka_xenial newton_xenial; do + CONF_TEMPLATES_DIR=/etc/compass/templates/ansible_installer/openstack_$os/vars + if [[ "$ENABLE_UBUNTU_THEME" == "true" ]]; then + cmd=" + sed -i '/enable_ubuntu_theme/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ + echo enable_ubuntu_theme: True >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl + " + else + cmd=" + sed -i '/enable_ubuntu_theme/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ + echo enable_ubuntu_theme: False >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl + " + fi + exec_cmd_on_compass $cmd + done } function inject_compass_conf() { -- cgit 1.2.3-korg