diff options
| author | rthallisey <rhallise@redhat.com> | 2015-08-28 18:42:18 -0400 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2015-09-23 19:33:27 +0000 |
| commit | aebb16fff9f33727aa9ce49120a1c6384544bfdc (patch) | |
| tree | 413e48ded6281e73bf997945608ebbc254b39a73 /docker/nova/nova-libvirt | |
| parent | 9a814e128fe910d57f83506d4e4be2f18156f9a7 (diff) | |
| download | kolla-aebb16fff9f33727aa9ce49120a1c6384544bfdc.tar.gz kolla-aebb16fff9f33727aa9ce49120a1c6384544bfdc.zip | |
Replace config-external with a JSON file for Nova
Change-Id: I38c545484a7b1f3906d844eb3a7486e11c4b276a
Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker/nova/nova-libvirt')
| -rwxr-xr-x | docker/nova/nova-libvirt/start.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/nova/nova-libvirt/start.sh b/docker/nova/nova-libvirt/start.sh index ae0de867b..aa07f62dd 100755 --- a/docker/nova/nova-libvirt/start.sh +++ b/docker/nova/nova-libvirt/start.sh @@ -1,14 +1,12 @@ #!/bin/bash set -o errexit -CMD="/usr/sbin/libvirtd" -ARGS="" - # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) # TODO(SamYaple): Tweak libvirt.conf rather than change permissions. # Fix permissions for libvirt @@ -17,4 +15,5 @@ if [[ -c /dev/kvm ]]; then chown root:kvm /dev/kvm fi -exec $CMD $ARGS +echo "Running command: ${CMD}" +exec $CMD |