aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-06 19:08:46 +0000
committerGerrit Code Review <review@openstack.org>2015-02-06 19:08:46 +0000
commit26b564dd06890862e268ea72b987bcb5ebf4bdb2 (patch)
tree726b9e932f6e5e711583bf9556100d4a5ad15e7d /docker/neutron
parente91aafc75a656f108f97d6adb69fe132923b9119 (diff)
parent91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 (diff)
downloadkolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.tar.gz
kolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.zip
Merge "Cleanup required variables checks for all containers"
Diffstat (limited to 'docker/neutron')
-rwxr-xr-xdocker/neutron/agents/dhcp/start.sh2
-rwxr-xr-xdocker/neutron/agents/l3/start.sh2
-rwxr-xr-xdocker/neutron/agents/linux-bridge/start.sh2
-rwxr-xr-xdocker/neutron/agents/metadata/start.sh5
-rw-r--r--docker/neutron/neutron-base/config-neutron.sh4
-rwxr-xr-xdocker/neutron/neutron-server/start.sh4
6 files changed, 17 insertions, 2 deletions
diff --git a/docker/neutron/agents/dhcp/start.sh b/docker/neutron/agents/dhcp/start.sh
index 81f35dd87..7754532a6 100755
--- a/docker/neutron/agents/dhcp/start.sh
+++ b/docker/neutron/agents/dhcp/start.sh
@@ -9,6 +9,8 @@ set -e
: ${DHCP_DRIVER:=neutron.agent.linux.dhcp.Dnsmasq}
: ${USE_NAMESPACES:=false}
+check_required_vars VERBOSE_LOGGING DEBUG_LOGGING
+
cfg=/etc/neutron/dhcp_agent.ini
# Configure dhcp_agent.ini
diff --git a/docker/neutron/agents/l3/start.sh b/docker/neutron/agents/l3/start.sh
index 602bf3193..17a09ad65 100755
--- a/docker/neutron/agents/l3/start.sh
+++ b/docker/neutron/agents/l3/start.sh
@@ -8,6 +8,8 @@ set -e
: ${INTERFACE_DRIVER:=neutron.agent.linux.interface.BridgeInterfaceDriver}
: ${USE_NAMESPACES:=false}
+check_required_vars VERBOSE_LOGGING DEBUG_LOGGING
+
cfg=/etc/neutron/l3_agent.ini
# Configure l3_agent.ini
diff --git a/docker/neutron/agents/linux-bridge/start.sh b/docker/neutron/agents/linux-bridge/start.sh
index e5982fe66..727db24b5 100755
--- a/docker/neutron/agents/linux-bridge/start.sh
+++ b/docker/neutron/agents/linux-bridge/start.sh
@@ -8,6 +8,8 @@ set -e
: ${BRIDGE_PHYSICAL_INTERFACE:=eth1}
: ${ML2_FLAT_NETWORK:=physnet1}
+check_required_vars PUBLIC_IP
+
cfg=/etc/neutron/plugins/ml2/ml2_conf.ini
# Configure ml2_conf.ini
diff --git a/docker/neutron/agents/metadata/start.sh b/docker/neutron/agents/metadata/start.sh
index fbe72e18f..9eef79a31 100755
--- a/docker/neutron/agents/metadata/start.sh
+++ b/docker/neutron/agents/metadata/start.sh
@@ -7,6 +7,11 @@ set -e
: ${KEYSTONE_REGION:=RegionOne}
+check_required_vars VERBOSE_LOGGING DEBUG_LOGGING KEYSTONE_AUTH_PROTOCOL \
+ KEYSTONE_PUBLIC_SERVICE_HOST ADMIN_TENANT_NAME \
+ NEUTRON_KEYSTONE_USER NEUTRON_KEYSTONE_PASSWORD \
+ NEUTRON_SHARED_SECRET NOVA_API_SERVICE_HOST
+
cfg=/etc/neutron/metadata_agent.ini
# Configure metadata_agent.ini
diff --git a/docker/neutron/neutron-base/config-neutron.sh b/docker/neutron/neutron-base/config-neutron.sh
index 7a68b19f2..35a1375ff 100644
--- a/docker/neutron/neutron-base/config-neutron.sh
+++ b/docker/neutron/neutron-base/config-neutron.sh
@@ -15,7 +15,9 @@ set -e
: ${VERBOSE_LOGGING:=true}
: ${DEBUG_LOGGING:=false}
-check_required_vars NEUTRON_KEYSTONE_PASSWORD
+check_required_vars NEUTRON_KEYSTONE_PASSWORD \
+ KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST
+
dump_vars
cat > /openrc <<EOF
diff --git a/docker/neutron/neutron-server/start.sh b/docker/neutron/neutron-server/start.sh
index ffa90a218..91af87bb3 100755
--- a/docker/neutron/neutron-server/start.sh
+++ b/docker/neutron/neutron-server/start.sh
@@ -6,9 +6,11 @@ set -e
. /opt/kolla/config-neutron.sh
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
+ KEYSTONE_AUTH_PROTOCOL NOVA_API_SERVICE_HOST \
+ NOVA_ADMIN_PASSWORD NEUTRON_DB_NAME NEUTRON_DB_USER \
NEUTRON_KEYSTONE_USER NEUTRON_KEYSTONE_PASSWORD \
ADMIN_TENANT_NAME NEUTRON_SERVER_SERVICE_HOST \
- PUBLIC_IP
+ PUBLIC_IP NEUTRON_DB_PASSWORD
check_for_keystone
check_for_db