aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2016-11-29 15:14:51 +0800
committerqi liang <liangqi1@huawei.com>2016-11-29 15:50:41 +0000
commit96f1168ba3a1f21f40e81cdf1c16f6f506a61143 (patch)
tree735dbb0ca379bcca17b95e43fcd176a0c47fef7e
parent6b2eccf0350f7f053e18ea2ac190489b00960809 (diff)
Update ubuntu-theme configure for mitaka_xenialcolorado.3.0
JIRA: - Change-Id: If8d30a70d846b3da4df6bf95cf2f222242b37404 Signed-off-by: QiLiang <liangqi1@huawei.com>
-rwxr-xr-xdeploy/compass_vm.sh27
1 files changed, 15 insertions, 12 deletions
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index a83f2b0..e6c9e8d 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; 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() {