From 9fa28e023cb149256702e86628da72ea3372c250 Mon Sep 17 00:00:00 2001 From: QiLiang Date: Wed, 30 Nov 2016 11:33:04 +0800 Subject: Support compute node expansion with ceph-osd JIRA: COMPASS-481 - Use public_vip to fetch ceph related conf from controller nodes. - Add ceph-uuid for libvirt store and fetch for expansion. Change-Id: I9e93183ac108bd959a1226546fbb89706e3004c9 Signed-off-by: QiLiang --- deploy/compass_vm.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'deploy/compass_vm.sh') diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh index 61e27051..b07b5081 100755 --- a/deploy/compass_vm.sh +++ b/deploy/compass_vm.sh @@ -70,8 +70,27 @@ function _inject_dashboard_conf() { done } +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 +} + function inject_compass_conf() { _inject_dashboard_conf + _inject_ceph_expansion_conf } function refresh_compass_core () { -- cgit 1.2.3-korg