diff options
| author | Sam Yaple <sam@yaple.net> | 2015-07-12 03:02:33 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-07-12 12:44:14 +0000 |
| commit | 7da0b2a80c093661766f9998760be8844584b0cc (patch) | |
| tree | 75356aef71b787c29ef61a5848a54da94bde7d47 /docker/common/nova-controller | |
| parent | 05a6640a0fadd25603c5fe63483e1fab4f19d2ac (diff) | |
| download | kolla-7da0b2a80c093661766f9998760be8844584b0cc.tar.gz kolla-7da0b2a80c093661766f9998760be8844584b0cc.zip | |
Ansible Nova w/ libvirt support
Initial support for Nova in Ansible
Partially-Implements: blueprint ansible-service
Change-Id: I4b0a74bd3e5daa5664f5e1e622bfb40c3285949e
Diffstat (limited to 'docker/common/nova-controller')
| -rwxr-xr-x | docker/common/nova-controller/nova-api/start.sh | 7 | ||||
| -rwxr-xr-x | docker/common/nova-controller/nova-conductor/start.sh | 7 |
2 files changed, 7 insertions, 7 deletions
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 |