From 2f2bb366e0aa856803c0d21a7a541802d814d180 Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Thu, 26 Mar 2015 19:47:56 +0000 Subject: Adds neutron-server to neutron container-set Adds neutron-server components of the neutron container set. Partially Implements: blueprint compute-operation-neutron Change-Id: I63525ae85f4ead4e010cdb9b6bc8059bb9d252e7 --- docker/neutron/neutron-base/Dockerfile | 1 - docker/neutron/neutron-base/config-neutron.sh | 82 ++++++++++++++++++--------- docker/neutron/neutron-server/Dockerfile | 4 +- docker/neutron/neutron-server/start.sh | 49 ++++++++-------- docker/nova-base/config-nova.sh | 9 +++ 5 files changed, 91 insertions(+), 54 deletions(-) (limited to 'docker') diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/neutron/neutron-base/Dockerfile index d4f89f3ae..22922a04c 100644 --- a/docker/neutron/neutron-base/Dockerfile +++ b/docker/neutron/neutron-base/Dockerfile @@ -5,4 +5,3 @@ RUN yum -y install openstack-neutron-ml2 && yum clean all RUN mkdir -p /opt/kolla COPY config-neutron.sh /opt/kolla/config-neutron.sh - diff --git a/docker/neutron/neutron-base/config-neutron.sh b/docker/neutron/neutron-base/config-neutron.sh index 6cbbc74ac..a079364a2 100644 --- a/docker/neutron/neutron-base/config-neutron.sh +++ b/docker/neutron/neutron-base/config-neutron.sh @@ -4,28 +4,33 @@ set -e . /opt/kolla/kolla-common.sh -: ${ADMIN_TENANT_NAME:=admin} +# Database : ${NEUTRON_DB_NAME:=neutron} : ${NEUTRON_DB_USER:=neutron} +: ${NEUTRON_DB_PASSWORD:=password} +# Keystone +: ${ADMIN_TENANT_NAME:=admin} : ${NEUTRON_KEYSTONE_USER:=neutron} +: ${NEUTRON_KEYSTONE_PASSWORD:=password} : ${KEYSTONE_AUTH_PROTOCOL:=http} +: ${KEYSTONE_ADMIN_SERVICE_HOST:=127.0.0.1} +: ${KEYSTONE_PUBLIC_SERVICE_HOST:=127.0.0.1} +: ${KEYSTONE_ADMIN_SERVICE_PORT:=35357} +: ${KEYSTONE_PUBLIC_SERVICE_PORT:=5000} +: ${KEYSTONE_REGION:=RegionOne} +# RabbitMQ : ${RABBIT_HOST:=$RABBITMQ_SERVICE_HOST} : ${RABBIT_USER:=guest} : ${RABBIT_PASSWORD:=guest} +# Logging : ${VERBOSE_LOGGING:=true} : ${DEBUG_LOGGING:=false} +# Networking +: ${NEUTRON_FLAT_NETWORK_NAME:=physnet1} check_required_vars NEUTRON_KEYSTONE_PASSWORD NEUTRON_LOG_DIR \ - KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST - -dump_vars - -cat > /openrc < /openrc <