openstack/kolla-ansible
Code Issues Proposed changes

Move scripts for nova to docker_templates

Browse Source 
Change-Id: If00f0f2e3258b7b2876b42b4fbda3681c49c8127
Partially-Implements: blueprint remove-docker-dir
This commit is contained in:
Steven Dake 2015-08-27 18:54:29 -07:00
parent ce86de9915
commit 9fe28bd220
32 changed files with 198 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/common/nova/nova-api/config-external.sh
View File

@ -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

20
docker/common/nova/nova-api/start.sh
View File

@ -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

10
docker/common/nova/nova-compute/config-external.sh
View File

@ -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

13
docker/common/nova/nova-compute/start.sh
View File

@ -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

10
docker/common/nova/nova-conductor/config-external.sh
View File

@ -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

13
docker/common/nova/nova-conductor/start.sh
View File

@ -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

10
docker/common/nova/nova-consoleauth/config-external.sh
View File

@ -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

13
docker/common/nova/nova-consoleauth/start.sh
View File

@ -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

10
docker/common/nova/nova-libvirt/config-external.sh
View File

@ -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

20
docker/common/nova/nova-libvirt/start.sh
View File

@ -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

10
docker/common/nova/nova-network/config-external.sh
View File

@ -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

13
docker/common/nova/nova-network/start.sh
View File

@ -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

10
docker/common/nova/nova-novncproxy/config-external.sh
View File

@ -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

13
docker/common/nova/nova-novncproxy/start.sh
View File

@ -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

10
docker/common/nova/nova-scheduler/config-external.sh
View File

@ -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

13
docker/common/nova/nova-scheduler/start.sh
View File

@ -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

1
docker_templates/nova/nova-api/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-api/config-external.sh

10
docker_templates/nova/nova-api/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/nova/nova-api/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-api/start.sh

20
docker_templates/nova/nova-api/start.sh Executable file
View File

@ -0,0 +1,20 @@
#!/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

1
docker_templates/nova/nova-compute/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-compute/config-external.sh

10
docker_templates/nova/nova-compute/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/nova/nova-compute/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-compute/start.sh

13
docker_templates/nova/nova-compute/start.sh Executable file
View File

@ -0,0 +1,13 @@
#!/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

1
docker_templates/nova/nova-conductor/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-conductor/config-external.sh

10
docker_templates/nova/nova-conductor/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/nova/nova-conductor/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-conductor/start.sh

13
docker_templates/nova/nova-conductor/start.sh Executable file
View File

@ -0,0 +1,13 @@
#!/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

1
docker_templates/nova/nova-consoleauth/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-consoleauth/config-external.sh

10
docker_templates/nova/nova-consoleauth/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/nova/nova-consoleauth/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-consoleauth/start.sh

13
docker_templates/nova/nova-consoleauth/start.sh Executable file
View File

@ -0,0 +1,13 @@
#!/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

1
docker_templates/nova/nova-libvirt/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-libvirt/config-external.sh

10
docker_templates/nova/nova-libvirt/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/nova/nova-libvirt/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-libvirt/start.sh

20
docker_templates/nova/nova-libvirt/start.sh Executable file
View File

@ -0,0 +1,20 @@
#!/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

1
docker_templates/nova/nova-network/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-network/config-external.sh

10
docker_templates/nova/nova-network/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/nova/nova-network/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-network/start.sh

13
docker_templates/nova/nova-network/start.sh Executable file
View File

@ -0,0 +1,13 @@
#!/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

1
docker_templates/nova/nova-novncproxy/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-novncproxy/config-external.sh

10
docker_templates/nova/nova-novncproxy/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/nova/nova-novncproxy/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-novncproxy/start.sh

13
docker_templates/nova/nova-novncproxy/start.sh Executable file
View File

@ -0,0 +1,13 @@
#!/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

1
docker_templates/nova/nova-scheduler/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-scheduler/config-external.sh

10
docker_templates/nova/nova-scheduler/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/nova/nova-scheduler/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/nova/nova-scheduler/start.sh

13
docker_templates/nova/nova-scheduler/start.sh Executable file
View File

@ -0,0 +1,13 @@
#!/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