From 7da0b2a80c093661766f9998760be8844584b0cc Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Sun, 12 Jul 2015 03:02:33 +0000 Subject: Ansible Nova w/ libvirt support Initial support for Nova in Ansible Partially-Implements: blueprint ansible-service Change-Id: I4b0a74bd3e5daa5664f5e1e622bfb40c3285949e --- docker/common/nova-controller/nova-api/start.sh | 7 +++++++ docker/common/nova-controller/nova-conductor/start.sh | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docker') diff --git a/docker/common/nova-controller/nova-api/start.sh b/docker/common/nova-controller/nova-api/start.sh index 0737ba0b7..0d7ffca9b 100755 --- a/docker/common/nova-controller/nova-api/start.sh +++ b/docker/common/nova-controller/nova-api/start.sh @@ -10,4 +10,11 @@ source /opt/kolla/kolla-common.sh # Config-internal script exec out of this function, it does not return here. set_configs +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + su -s /bin/sh -c "nova-manage db sync" nova + exit 0 +fi + exec $CMD $ARGS diff --git a/docker/common/nova-controller/nova-conductor/start.sh b/docker/common/nova-controller/nova-conductor/start.sh index e3a322719..4a0074d39 100755 --- a/docker/common/nova-controller/nova-conductor/start.sh +++ b/docker/common/nova-controller/nova-conductor/start.sh @@ -10,11 +10,4 @@ source /opt/kolla/kolla-common.sh # Config-internal script exec out of this function, it does not return here. set_configs -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - su -s /bin/sh -c "nova-manage db sync" nova - exit 0 -fi - exec $CMD $ARGS -- cgit v1.2.3