openstack/kolla
Code Issues Proposed changes

Remove service_hosts.sh

Browse Source 
* Remove service_hosts.sh file
* Add all the required variables to tools/genenv

Change-Id: I23954bf148923fbe785f51012fc9c9da909fa380
Closes-Bug: #1447867
This commit is contained in:
Swapnil Kulkarni 2015-08-03 05:07:47 +00:00
parent 3097d3e48d
commit fd92ad8a27
20 changed files with 40 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/centos/binary/base/Dockerfile
View File

@ -118,4 +118,4 @@ RUN rpm -e --nodeps pam
RUN yum -y install pam+noaudit && yum clean all
# End dirty like zebra
COPY service_hosts.sh kolla-common.sh /opt/kolla/
COPY kolla-common.sh /opt/kolla/

1
docker/centos/binary/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

2
docker/centos/source/base/Dockerfile
View File

@ -35,4 +35,4 @@ RUN pip install --upgrade \
pip \
tox
COPY service_hosts.sh kolla-common.sh /opt/kolla/
COPY kolla-common.sh /opt/kolla/

1
docker/centos/source/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

2
docker/common/base/kolla-common.sh
View File

@ -1,7 +1,5 @@
#!/bin/bash
. /opt/kolla/service_hosts.sh
# Set some generally useful defaults.
MY_IP=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
awk '$4 == "src" {print $5}')

45
docker/common/base/service_hosts.sh
View File

@ -1,45 +0,0 @@
#!/bin/bash
# Kubernetes currently creates FOO_SERVICE_HOST and FOO_SERVICE_PORT env vars
# as part of starting the containers. However this is not done when starting
# them with plain docker. Defaulting variables to their common version if
# they're not already set allows the usage of --link in plain 'docker run' to
# wire together containers.
: ${BARBICAN_ADMIN_SERVICE_HOST:=$BARBICAN_ADMIN_PORT_9312_TCP_ADDR}
: ${BARBICAN_ADMIN_SERVICE_PORT:=9312}
: ${BARBICAN_PUBLIC_SERVICE_HOST:=$BARBICAN_PUBLIC_PORT_9311_TCP_ADDR}
: ${BARBICAN_PUBLIC_SERVICE_PORT:=9311}
: ${CEILOMETER_API_SERVICE_HOST:=$CEILOMETER_API_PORT_8777_TCP_ADDR}
: ${CEILOMETER_API_SERVICE_PORT:=8777}
: ${GLANCE_API_SERVICE_HOST:=$GLANCE_API_PORT_9292_TCP_ADDR}
: ${GLANCE_API_SERVICE_PORT:=9292}
: ${GLANCE_REGISTRY_SERVICE_HOST:=$GLANCE_REGISTRY_PORT_9191_TCP_ADDR}
: ${GLANCE_REGISTRY_SERVICE_PORT:=9191}
: ${HEAT_API_SERVICE_HOST:=$HEAT_API_PORT_8004_TCP_ADDR}
: ${HEAT_API_SERVICE_PORT:=8004}
: ${HORIZON_SERVICE_HOST:=$HORIZON_PORT_80_TCP_ADDR}
: ${HORIZON_SERVICE_PORT:=80}
: ${KEYSTONE_ADMIN_SERVICE_HOST:=$KEYSTONE_PORT_35357_TCP_ADDR}
: ${KEYSTONE_ADMIN_SERVICE_PORT:=35357}
: ${KEYSTONE_PUBLIC_SERVICE_HOST:=$KEYSTONE_PORT_5000_TCP_ADDR}
: ${KEYSTONE_PUBLIC_SERVICE_PORT:=5000}
: ${MARIADB_SERVICE_HOST:=$MARIADB_PORT_3306_TCP_ADDR}
: ${MARIADB_SERVICE_PORT:=3306}
: ${MONGODB_SERVICE_HOST:=$MONGODB_PORT_27017_TCP_ADDR}
: ${MONGODB_SERVICE_PORT:=27017}
: ${NEUTRON_SERVER_SERVICE_HOST:=$NEUTRON_SERVER_PORT_9696_TCP_ADDR}
: ${NEUTRON_SERVER_SERVICE_PORT:=9696}
: ${NOVA_API_SERVICE_HOST:=$NOVA_API_PORT_8774_TCP_ADDR}
: ${NOVA_API_SERVICE_PORT:=8774}
: ${NOVA_EC2_API_SERVICE_HOST:=$NOVA_EC2_API_PORT_8773_TCP_ADDR}
: ${NOVA_EC2_API_SERVICE_PORT:=8773}
: ${NOVA_LIBVIRT_SERVICE_HOST:=$NOVA_LIBVIRT_PORT_16509_TCP_ADDR}
: ${NOVA_LIBVIRT_SERVICE_PORT:=16509}
: ${NOVA_METADATA_API_SERVICE_HOST:=$NOVA_METADATA_API_PORT_8775_TCP_ADDR}
: ${NOVA_METADATA_API_SERVICE_PORT:=8775}
: ${RABBITMQ_SERVICE_HOST:=$RABBITMQ_PORT_5672_TCP_ADDR}
: ${RABBITMQ_SERVICE_PORT:=5672}
: ${ZAQAR_SERVER_SERVICE_HOST:=$ZAQAR_SERVER_PORT_8888_TCP_ADDR}
: ${ZAQAR_SERVER_SERVICE_PORT:=8888}

2
docker/fedora/binary/base/Dockerfile
View File

@ -104,4 +104,4 @@ RUN rpm -e --nodeps pam
RUN yum -y install pam+noaudit && yum clean all
# End dirty like zebra
COPY service_hosts.sh kolla-common.sh /opt/kolla/
COPY kolla-common.sh /opt/kolla/

1
docker/fedora/binary/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

2
docker/fedora/source/base/Dockerfile
View File

@ -46,4 +46,4 @@ RUN pip install --upgrade \
pip \
tox
COPY service_hosts.sh kolla-common.sh /opt/kolla/
COPY kolla-common.sh /opt/kolla/

1
docker/fedora/source/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

2
docker/ol/binary/base/Dockerfile
View File

@ -9,4 +9,4 @@ RUN yum update -y \
&& rm -f get-pip.py \
&& pip install crudini
COPY service_hosts.sh kolla-common.sh /opt/kolla/
COPY kolla-common.sh /opt/kolla/

1
docker/ol/binary/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

2
docker/ol/source/base/Dockerfile
View File

@ -28,4 +28,4 @@ RUN curl https://codeload.github.com/larsks/crux/tar.gz/7 -o /crux-7.tar.gz \
&& pip install /crux-7 \
&& rm -rf /crux-7.tar.gz /crux-7
COPY service_hosts.sh kolla-common.sh /opt/kolla/
COPY kolla-common.sh /opt/kolla/

1
docker/ol/source/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

1
docker/rhel/binary/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

2
docker/ubuntu/binary/base/Dockerfile
View File

@ -13,4 +13,4 @@ RUN apt-get update \
openssl \
&& apt-get clean
COPY service_hosts.sh kolla-common.sh /opt/kolla/
COPY kolla-common.sh /opt/kolla/

1
docker/ubuntu/binary/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

2
docker/ubuntu/source/base/Dockerfile
View File

@ -36,4 +36,4 @@ RUN pip install --upgrade \
pip \
tox
COPY service_hosts.sh kolla-common.sh /opt/kolla/
COPY kolla-common.sh /opt/kolla/

1
docker/ubuntu/source/base/service_hosts.sh
View File

@ -1 +0,0 @@
../../../common/base/service_hosts.sh

32
tools/genenv
View File

@ -62,6 +62,8 @@ INIT_KEYSTONE_DB=true
INIT_NOVA_DB=true
INNODB_FILE_PER_TABLE=true
MARIADB_MAX_CONNECTIONS=151
MARIADB_SERVICE_PORT=3306
MONGODB_SERVICE_PORT=27017
MARIADB_ROOT_PASSWORD=kolla
PASSWORD=12345
TEMP_FILE=/tmp/mysql-first-time.sql
@ -106,19 +108,23 @@ VERBOSE_LOGGING=true
RABBITMQ_CLUSTER_COOKIE=
RABBITMQ_CLUSTER_NODES=
RABBITMQ_SERVICE_HOST=$HOST_IP
RABBITMQ_SERVICE_PORT=5672
RABBIT_PASSWORD=guest
RABBIT_USER=guest
#Barbican
ADMIN_TENANT_NAME=admin
BARBICAN_ADMIN_SERVICE_PORT=9312
BARBICAN_DB_NAME=barbican
BARBICAN_DB_USER=barbican
BARBICAN_KEYSTONE_USER=barbican
BARBICAN_PUBLIC_SERVICE_PORT=9311
KEYSTONE_AUTH_PROTOCOL=http
#Ceilometer
CEILOMETER_ADMIN_PASSWORD=password
CEILOMETER_API_SERVICE_HOST=$HOST_IP
CEILOMETER_API_SERVICE_PORT=8777
CEILOMETER_DB_NAME=ceilometer
CEILOMETER_DB_PASSWORD=password
CEILOMETER_DB_USER=ceilometer
@ -179,12 +185,14 @@ DESIGNATE_SINK_NEUTRON_FORMATS=("%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(d
# Glance
GLANCE_API_SERVICE_HOST=$HOST_IP
GLANCE_API_SERVICE_PORT=9292
GLANCE_DB_NAME=glance
GLANCE_DB_PASSWORD=kolla
GLANCE_DB_USER=glance
GLANCE_KEYSTONE_PASSWORD=glance
GLANCE_KEYSTONE_USER=glance
GLANCE_REGISTRY_SERVICE_HOST=$HOST_IP
GLANCE_REGISTRY_SERVICE_PORT=9191
# Gnocchi
GNOCCHI_DB_PASSWORD=gnocchi
@ -204,6 +212,7 @@ HEAT_API_CFN_SERVICE_HOST=$HOST_IP
HEAT_API_CFN_SERVICE_PORT=8000
HEAT_API_CFN_URL_HOST=$HOST_IP
HEAT_API_SERVICE_HOST=$HOST_IP
HEAT_API_SERVICE_PORT=8004
HEAT_CFN_KEYSTONE_PASSWORD=heat
HEAT_CFN_KEYSTONE_USER=heat-cfn
HEAT_DB_NAME=heat
@ -214,6 +223,7 @@ HEAT_KEYSTONE_USER=heat
#Horizon
HORIZON_KEYSTONE_USER=horizon
HORIZON_SERVICE_PORT=80
# Keystone
KEYSTONE_ADMIN_PASSWORD=$PASSWORD
@ -250,6 +260,7 @@ NEUTRON_DB_PASSWORD=password
NEUTRON_KEYSTONE_USER=neutron
NEUTRON_KEYSTONE_PASSWORD=neutron
NEUTRON_SERVER_SERVICE_HOST=$HOST_IP
NEUTRON_SERVER_SERVICE_PORT=9696
NEUTRON_API_PASTE_CONFIG=/usr/share/neutron/api-paste.ini
# Neutron ML2 Plugin
TYPE_DRIVERS=flat,vxlan
@ -282,14 +293,18 @@ NETWORK_MANAGER=neutron
ENABLED_APIS=ec2,osapi_compute,metadata
METADATA_HOST=$HOST_IP
NOVA_API_SERVICE_HOST=$HOST_IP
NOVA_API_SERVICE_PORT=8774
NOVA_DB_NAME=nova
NOVA_DB_PASSWORD=nova
NOVA_DB_USER=nova
NOVA_EC2_SERVICE_HOST=$HOST_IP
NOVA_EC2_API_SERVICE_PORT=8773
NOVA_FLAT_INTERFACE=eth1
NOVA_KEYSTONE_PASSWORD=nova
NOVA_KEYSTONE_USER=nova
NOVA_LIBVIRT_SERVICE_PORT=16509
NOVA_METADATA_API_SERVICE_HOST=$HOST_IP
NOVA_METADATA_API_SERVICE_PORT=8775
NOVA_NOVNC_BASE_ADDRESS=${PUBLIC_IP}
NOVA_NOVNC_PROXY_PORT=6080
NOVA_NOVNC_PROXY_SERVICE_HOST=0.0.0.0
@ -362,6 +377,7 @@ SWIFT_ACCOUNT_SVC_RING_ZONES="1,2,3"
#Zaqar
ZAQAR_KEYSTONE_USER=zaqar
ZAQAR_SERVER_SERVICE_PORT=8888
# this should use the keystone admin port
# https://bugs.launchpad.net/kolla/+bug/1469209
@ -376,12 +392,15 @@ EOF
cat > ./compose/openstack.env <<EOF
ADMIN_TENANT_NAME=$ADMIN_TENANT_NAME
ADMIN_USER_PASSWORD=$ADMIN_USER_PASSWORD
BARBICAN_ADMIN_SERVICE_PORT=$BARBICAN_ADMIN_SERVICE_PORT
BARBICAN_DB_NAME=$BARBICAN_DB_NAME
BARBICAN_DB_USER=$BARBICAN_DB_USER
BARBICAN_KEYSTONE_USER=$BARBICAN_KEYSTONE_USER
BARBICAN_PUBLIC_SERVICE_PORT=$BARBICAN_PUBLIC_SERVICE_PORT
BIND_ADDRESS=$BIND_ADDRESS
CEILOMETER_ADMIN_PASSWORD=$CEILOMETER_ADMIN_PASSWORD
CEILOMETER_API_SERVICE_HOST=$CEILOMETER_API_SERVICE_HOST
CEILOMETER_API_SERVICE_PORT=$CEILOMETER_API_SERVICE_PORT
CEILOMETER_DB_NAME=$CEILOMETER_DB_NAME
CEILOMETER_DB_PASSWORD=$CEILOMETER_DB_PASSWORD
CEILOMETER_DB_USER=$CEILOMETER_DB_USER
@ -450,16 +469,19 @@ ENABLED_APIS=$ENABLED_APIS
ENDPOINT_TYPE=$ENDPOINT_TYPE
FLAT_INTERFACE=$NOVA_FLAT_INTERFACE
GLANCE_API_SERVICE_HOST=$GLANCE_API_SERVICE_HOST
GLANCE_API_SERVICE_PORT=$GLANCE_API_SERVICE_PORT
GLANCE_DB_NAME=$GLANCE_DB_NAME
GLANCE_DB_PASSWORD=$GLANCE_DB_PASSWORD
GLANCE_DB_USER=$GLANCE_DB_USER
GLANCE_KEYSTONE_PASSWORD=$GLANCE_KEYSTONE_PASSWORD
GLANCE_KEYSTONE_USER=$GLANCE_KEYSTONE_USER
GLANCE_REGISTRY_SERVICE_HOST=$GLANCE_REGISTRY_SERVICE_HOST
GLANCE_REGISTRY_SERVICE_PORT=$GLANCE_REGISTRY_SERVICE_PORT
HEAT_API_CFN_SERVICE_HOST=$HEAT_API_CFN_SERVICE_HOST
HEAT_API_CFN_SERVICE_PORT=$HEAT_API_CFN_SERVICE_PORT
HEAT_API_CFN_URL_HOST=$HEAT_API_CFN_URL_HOST
HEAT_API_SERVICE_HOST=$HEAT_API_SERVICE_HOST
HEAT_API_SERVICE_PORT=$HEAT_API_SERVICE_PORT
HEAT_CFN_KEYSTONE_PASSWORD=$HEAT_CFN_KEYSTONE_PASSWORD
HEAT_CFN_KEYSTONE_USER=$HEAT_CFN_KEYSTONE_USER
HEAT_DB_NAME=$HEAT_DB_NAME
@ -468,6 +490,7 @@ HEAT_DOMAIN_PASS=$HEAT_DOMAIN_PASS
HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD
HEAT_KEYSTONE_USER=$HEAT_KEYSTONE_USER
HORIZON_KEYSTONE_USER=$HORIZON_KEYSTONE_USER
HORIZON_SERVICE_PORT=$HORIZON_SERVICE_PORT
INIT_CINDER_DB=$INIT_CINDER_DB
INIT_CONNECT=$INIT_CONNECT
INIT_DESIGNATE_DB=$INIT_DESIGNATE_DB
@ -503,8 +526,10 @@ MAGNUM_KEYSTONE_USER=$MAGNUM_KEYSTONE_USER
MARIADB_MAX_CONNECTIONS=$MARIADB_MAX_CONNECTIONS
MARIADB_ROOT_PASSWORD=$MARIADB_ROOT_PASSWORD
MARIADB_SERVICE_HOST=$HOST_IP
MARIADB_SERVICE_PORT=$MARIADB_SERVICE_PORT
MECHANISM_DRIVERS=$MECHANISM_DRIVERS
METADATA_HOST=$METADATA_HOST
MONGODB_SERVICE_PORT=$MONGODB_SERVICE_PORT
NETWORK_MANAGER=$NETWORK_MANAGER
NEUTRON_API_PASTE_CONFIG=$NEUTRON_API_PASTE_CONFIG
NEUTRON_DB_NAME=$NEUTRON_DB_NAME
@ -520,9 +545,11 @@ NEUTRON_LOG_DIR=$NEUTRON_LOG_DIR
NEUTRON_METADATA_AGENT_LOG_FILE=$NEUTRON_METADATA_AGENT_LOG_FILE
NEUTRON_SERVER_LOG_FILE=$NEUTRON_SERVER_LOG_FILE
NEUTRON_SERVER_SERVICE_HOST=$NEUTRON_SERVER_SERVICE_HOST
NEUTRON_SERVER_SERVICE_PORT=$NEUTRON_SERVER_SERVICE_PORT
NEUTRON_SHARED_SECRET=$NEUTRON_SHARED_SECRET
NOVA_API_LOG_FILE=$NOVA_API_LOG_FILE
NOVA_API_SERVICE_HOST=$NOVA_API_SERVICE_HOST
NOVA_API_SERVICE_PORT=$NOVA_API_SERVICE_PORT
NOVA_COMPUTE_LOG_FILE=$NOVA_COMPUTE_LOG_FILE
NOVA_CONDUCTOR_LOG_FILE=$NOVA_CONDUCTOR_LOG_FILE
NOVA_CONSOLEAUTH_LOG_FILE=$NOVA_CONSOLEAUTH_LOG_FILE
@ -531,10 +558,13 @@ NOVA_DB_PASSWORD=$NOVA_DB_PASSWORD
NOVA_DB_USER=$NOVA_DB_USER
NOVA_EC2_API_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST
NOVA_EC2_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST
NOVA_EC2_API_SERVICE_PORT=$NOVA_EC2_API_SERVICE_PORT
NOVA_KEYSTONE_PASSWORD=$NOVA_KEYSTONE_PASSWORD
NOVA_KEYSTONE_USER=$NOVA_KEYSTONE_USER
NOVA_LOG_DIR=$NOVA_LOG_DIR
NOVA_LIBVIRT_SERVICE_PORT=$NOVA_LIBVIRT_SERVICE_PORT
NOVA_METADATA_API_SERVICE_HOST=$NOVA_METADATA_API_SERVICE_HOST
NOVA_METADATA_API_SERVICE_PORT=$NOVA_METADATA_API_SERVICE_PORT
NOVA_NOVNCPROXY_LOG_FILE=$NOVA_NOVNCPROXY_LOG_FILE
NOVA_NOVNC_BASE_ADDRESS=${NOVA_NOVNC_BASE_ADDRESS}RI
NOVA_NOVNC_PROXY_PORT=$NOVA_NOVNC_PROXY_PORT
@ -551,6 +581,7 @@ RABBITMQ_CLUSTER_COOKIE=$RABBITMQ_CLUSTER_COOKIE
RABBITMQ_CLUSTER_NODES=$RABBITMQ_CLUSTER_NODES
RABBITMQ_PASS=$RABBIT_PASSWORD
RABBITMQ_SERVICE_HOST=$RABBITMQ_SERVICE_HOST
RABBITMQ_SERVICE_PORT=$RABBITMQ_SERVICE_PORT
RABBITMQ_USER=$RABBIT_USER
RABBIT_PASSWORD=$RABBIT_PASSWORD
RABBIT_USERID=$RABBIT_USER
@ -621,6 +652,7 @@ TYPE_DRIVERS=$TYPE_DRIVERS
USE_NAMESPACES=$USE_NAMESPACES
VERBOSE_LOGGING=$VERBOSE_LOGGING
ZAQAR_KEYSTONE_USER=$ZAQAR_KEYSTONE_USER
ZAQAR_SERVER_SERVICE_PORT=$ZAQAR_SERVER_SERVICE_PORT
EOF
echo Please customize your FLAT_INTERFACE to a different network then your