diff options
Diffstat (limited to 'docker/common')
| -rwxr-xr-x | docker/common/nova/nova-api/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/nova/nova-api/start.sh | 20 | ||||
| -rwxr-xr-x | docker/common/nova/nova-compute/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/nova/nova-compute/start.sh | 13 | ||||
| -rwxr-xr-x | docker/common/nova/nova-conductor/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/nova/nova-conductor/start.sh | 13 | ||||
| -rwxr-xr-x | docker/common/nova/nova-consoleauth/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/nova/nova-consoleauth/start.sh | 13 | ||||
| -rwxr-xr-x | docker/common/nova/nova-libvirt/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/nova/nova-libvirt/start.sh | 20 | ||||
| -rwxr-xr-x | docker/common/nova/nova-network/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/nova/nova-network/start.sh | 13 | ||||
| -rwxr-xr-x | docker/common/nova/nova-novncproxy/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/nova/nova-novncproxy/start.sh | 13 | ||||
| -rwxr-xr-x | docker/common/nova/nova-scheduler/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/nova/nova-scheduler/start.sh | 13 |
16 files changed, 0 insertions, 198 deletions
diff --git a/docker/common/nova/nova-api/config-external.sh b/docker/common/nova/nova-api/config-external.sh deleted file mode 100755 index d0859893d..000000000 --- a/docker/common/nova/nova-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-api/nova.conf" -TARGET="/etc/nova/nova.conf" -OWNER="nova" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/nova/nova-api/start.sh b/docker/common/nova/nova-api/start.sh deleted file mode 100755 index ad25ba65c..000000000 --- a/docker/common/nova/nova-api/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-api" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -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/nova-compute/config-external.sh b/docker/common/nova/nova-compute/config-external.sh deleted file mode 100755 index e844bf50c..000000000 --- a/docker/common/nova/nova-compute/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-compute/nova.conf" -TARGET="/etc/nova/nova.conf" -OWNER="nova" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/nova/nova-compute/start.sh b/docker/common/nova/nova-compute/start.sh deleted file mode 100755 index 48e77542b..000000000 --- a/docker/common/nova/nova-compute/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-compute" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/nova/nova-conductor/config-external.sh b/docker/common/nova/nova-conductor/config-external.sh deleted file mode 100755 index ea3b123ec..000000000 --- a/docker/common/nova/nova-conductor/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-conductor/nova.conf" -TARGET="/etc/nova/nova.conf" -OWNER="nova" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/nova/nova-conductor/start.sh b/docker/common/nova/nova-conductor/start.sh deleted file mode 100755 index 1fe7d0586..000000000 --- a/docker/common/nova/nova-conductor/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-conductor" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/nova/nova-consoleauth/config-external.sh b/docker/common/nova/nova-consoleauth/config-external.sh deleted file mode 100755 index 1da10d83f..000000000 --- a/docker/common/nova/nova-consoleauth/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-consoleauth/nova.conf" -TARGET="/etc/nova/nova.conf" -OWNER="nova" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/nova/nova-consoleauth/start.sh b/docker/common/nova/nova-consoleauth/start.sh deleted file mode 100755 index 1abccde19..000000000 --- a/docker/common/nova/nova-consoleauth/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-consoleauth" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/nova/nova-libvirt/config-external.sh b/docker/common/nova/nova-libvirt/config-external.sh deleted file mode 100755 index acc1c5473..000000000 --- a/docker/common/nova/nova-libvirt/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/libvirt/libvirtd.conf" -TARGET="/etc/libvirt/libvirtd.conf" -OWNER="libvirt" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/nova/nova-libvirt/start.sh b/docker/common/nova/nova-libvirt/start.sh deleted file mode 100755 index ae0de867b..000000000 --- a/docker/common/nova/nova-libvirt/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/sbin/libvirtd" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -# TODO(SamYaple): Tweak libvirt.conf rather than change permissions. -# Fix permissions for libvirt -if [[ -c /dev/kvm ]]; then - chmod 660 /dev/kvm - chown root:kvm /dev/kvm -fi - -exec $CMD $ARGS diff --git a/docker/common/nova/nova-network/config-external.sh b/docker/common/nova/nova-network/config-external.sh deleted file mode 100755 index 7c1d6bb37..000000000 --- a/docker/common/nova/nova-network/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-network/nova.conf" -TARGET="/etc/nova/nova.conf" -OWNER="nova" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/nova/nova-network/start.sh b/docker/common/nova/nova-network/start.sh deleted file mode 100755 index 88f941b33..000000000 --- a/docker/common/nova/nova-network/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-network" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/nova/nova-novncproxy/config-external.sh b/docker/common/nova/nova-novncproxy/config-external.sh deleted file mode 100755 index fdc33a5bd..000000000 --- a/docker/common/nova/nova-novncproxy/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-novncproxy/nova.conf" -TARGET="/etc/nova/nova.conf" -OWNER="nova" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/nova/nova-novncproxy/start.sh b/docker/common/nova/nova-novncproxy/start.sh deleted file mode 100755 index 6e59d1253..000000000 --- a/docker/common/nova/nova-novncproxy/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-novncproxy" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/nova/nova-scheduler/config-external.sh b/docker/common/nova/nova-scheduler/config-external.sh deleted file mode 100755 index 3df0f9b7b..000000000 --- a/docker/common/nova/nova-scheduler/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-scheduler/nova.conf" -TARGET="/etc/nova/nova.conf" -OWNER="nova" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/nova/nova-scheduler/start.sh b/docker/common/nova/nova-scheduler/start.sh deleted file mode 100755 index d9b3e14eb..000000000 --- a/docker/common/nova/nova-scheduler/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-scheduler" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS |
