Update ubuntu-theme configure for mitaka_xenial 73/25073/2 colorado.3.0
authorQiLiang <liangqi1@huawei.com>
Tue, 29 Nov 2016 07:14:51 +0000 (15:14 +0800)
committerqi liang <liangqi1@huawei.com>
Tue, 29 Nov 2016 15:50:41 +0000 (15:50 +0000)
JIRA: -

Change-Id: If8d30a70d846b3da4df6bf95cf2f222242b37404
Signed-off-by: QiLiang <liangqi1@huawei.com>
deploy/compass_vm.sh

index a83f2b0..e6c9e8d 100755 (executable)
@@ -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() {