aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 18:54:29 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:29 -0700
commit9fe28bd22018bc140b5202786a3cecd6337ca973 (patch)
tree2c82ceeecd4f21ddf3736ab5b46b153a9615383b /docker
parentce86de9915d24f3a3dc7688ff66a536b6adb780b (diff)
downloadkolla-9fe28bd22018bc140b5202786a3cecd6337ca973.tar.gz
kolla-9fe28bd22018bc140b5202786a3cecd6337ca973.zip
Move scripts for nova to docker_templates
Change-Id: If00f0f2e3258b7b2876b42b4fbda3681c49c8127 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/common/nova/nova-api/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-api/start.sh20
-rwxr-xr-xdocker/common/nova/nova-compute/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-compute/start.sh13
-rwxr-xr-xdocker/common/nova/nova-conductor/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-conductor/start.sh13
-rwxr-xr-xdocker/common/nova/nova-consoleauth/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-consoleauth/start.sh13
-rwxr-xr-xdocker/common/nova/nova-libvirt/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-libvirt/start.sh20
-rwxr-xr-xdocker/common/nova/nova-network/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-network/start.sh13
-rwxr-xr-xdocker/common/nova/nova-novncproxy/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-novncproxy/start.sh13
-rwxr-xr-xdocker/common/nova/nova-scheduler/config-external.sh10
-rwxr-xr-xdocker/common/nova/nova-scheduler/start.sh13
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