diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-10-25 06:33:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-25 06:33:25 +0000 |
| commit | d0c360afa9c61e1b2dde99935510f6ca061920ca (patch) | |
| tree | 0c983eb13b07bfab8b50eb394b635645861ac29e /deploy/compass_vm.sh | |
| parent | 6ebd4fddcd9e68d8b9fcc9e8855957909a80a3df (diff) | |
| parent | 0d4fc38c569df7a417065fd3094c7477660eb18c (diff) | |
Merge "Edit the docker file and adjust HA yml"
Diffstat (limited to 'deploy/compass_vm.sh')
| -rwxr-xr-x | deploy/compass_vm.sh | 27 |
1 files changed, 15 insertions, 12 deletions
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() { |