diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-20 16:44:59 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2016-12-22 10:54:34 +0800 |
| commit | a9041dbf7b68f56169e82de3c37601b7e86867b0 (patch) | |
| tree | 8364c3b523bc0ac1e8dceda0d66eed4b8d2816f5 /deploy/compass_vm.sh | |
| parent | 819912d0379f6cd2b2693c2968576f7514a117c5 (diff) | |
Change newton_xenial to newton
JIRA: COMPASS-513
Change-Id: I937a02bcd69f0df1f5d951dd6630ef2e76e8d386
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/compass_vm.sh')
| -rwxr-xr-x | deploy/compass_vm.sh | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh index 4c6ba3fe..294f2bee 100755 --- a/deploy/compass_vm.sh +++ b/deploy/compass_vm.sh @@ -53,39 +53,37 @@ function exec_cmd_on_compass() { } function _inject_dashboard_conf() { - 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 + os=newton + 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 } function _inject_ceph_expansion_conf() { - for os in mitaka mitaka_xenial newton_xenial osp9; do - CONF_TEMPLATES_DIR=/etc/compass/templates/ansible_installer/openstack_$os/vars - if [[ "$EXPANSION" == "true" ]]; then - cmd=" - sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ - echo compute_expansion: True >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ - " - else - cmd=" - sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ - echo compute_expansion: False >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ - " - fi - exec_cmd_on_compass $cmd - done + os=newton + CONF_TEMPLATES_DIR=/etc/compass/templates/ansible_installer/openstack_$os/vars + if [[ "$EXPANSION" == "true" ]]; then + cmd=" + sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ + echo compute_expansion: True >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ + " + else + cmd=" + sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ + echo compute_expansion: False >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \ + " + fi + exec_cmd_on_compass $cmd } function inject_compass_conf() { @@ -213,7 +211,6 @@ function launch_compass() { function recover_compass() { log_info "recover_compass enter" - sudo virsh start compass if ! wait_ok 500;then @@ -285,7 +282,7 @@ function wait_controller_nodes_ok() { function get_public_vip () { ssh $ssh_args root@$MGMT_IP " - cd /var/ansible/run/openstack_newton_xenial-opnfv2 + cd /var/ansible/run/$ADAPTER_NAME'-'$CLUSTER_NAME cat group_vars/all | grep -A 3 public_vip: | sed -n '2p' |sed -e 's/ ip: //g' " } |