diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile index 4cac35598e..1003d8df21 100644 --- a/docker/centos/binary/base/Dockerfile +++ b/docker/centos/binary/base/Dockerfile @@ -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/ diff --git a/docker/centos/binary/base/service_hosts.sh b/docker/centos/binary/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/centos/binary/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile index cc5ed43f79..91e19915f1 100644 --- a/docker/centos/source/base/Dockerfile +++ b/docker/centos/source/base/Dockerfile @@ -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/ diff --git a/docker/centos/source/base/service_hosts.sh b/docker/centos/source/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/centos/source/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/docker/common/base/kolla-common.sh b/docker/common/base/kolla-common.sh index 5c07b375de..d3babfc260 100644 --- a/docker/common/base/kolla-common.sh +++ b/docker/common/base/kolla-common.sh @@ -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}') diff --git a/docker/common/base/service_hosts.sh b/docker/common/base/service_hosts.sh deleted file mode 100755 index c3006f720a..0000000000 --- a/docker/common/base/service_hosts.sh +++ /dev/null @@ -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} - diff --git a/docker/fedora/binary/base/Dockerfile b/docker/fedora/binary/base/Dockerfile index 21e998e116..2b6776d35b 100644 --- a/docker/fedora/binary/base/Dockerfile +++ b/docker/fedora/binary/base/Dockerfile @@ -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/ diff --git a/docker/fedora/binary/base/service_hosts.sh b/docker/fedora/binary/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/fedora/binary/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/docker/fedora/source/base/Dockerfile b/docker/fedora/source/base/Dockerfile index 04afcdc722..367e37a47c 100644 --- a/docker/fedora/source/base/Dockerfile +++ b/docker/fedora/source/base/Dockerfile @@ -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/ diff --git a/docker/fedora/source/base/service_hosts.sh b/docker/fedora/source/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/fedora/source/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/docker/ol/binary/base/Dockerfile b/docker/ol/binary/base/Dockerfile index bdc9f5428c..169cb5f3a9 100644 --- a/docker/ol/binary/base/Dockerfile +++ b/docker/ol/binary/base/Dockerfile @@ -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/ diff --git a/docker/ol/binary/base/service_hosts.sh b/docker/ol/binary/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/ol/binary/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/docker/ol/source/base/Dockerfile b/docker/ol/source/base/Dockerfile index 1dd76d39e7..f75e563282 100644 --- a/docker/ol/source/base/Dockerfile +++ b/docker/ol/source/base/Dockerfile @@ -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/ diff --git a/docker/ol/source/base/service_hosts.sh b/docker/ol/source/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/ol/source/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/docker/rhel/binary/base/service_hosts.sh b/docker/rhel/binary/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/rhel/binary/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/docker/ubuntu/binary/base/Dockerfile b/docker/ubuntu/binary/base/Dockerfile index e5e0f52424..dbe5e97dde 100644 --- a/docker/ubuntu/binary/base/Dockerfile +++ b/docker/ubuntu/binary/base/Dockerfile @@ -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/ diff --git a/docker/ubuntu/binary/base/service_hosts.sh b/docker/ubuntu/binary/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/ubuntu/binary/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/docker/ubuntu/source/base/Dockerfile b/docker/ubuntu/source/base/Dockerfile index c0049b53dc..667f3832a7 100644 --- a/docker/ubuntu/source/base/Dockerfile +++ b/docker/ubuntu/source/base/Dockerfile @@ -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/ diff --git a/docker/ubuntu/source/base/service_hosts.sh b/docker/ubuntu/source/base/service_hosts.sh deleted file mode 120000 index 06e0454405..0000000000 --- a/docker/ubuntu/source/base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/service_hosts.sh \ No newline at end of file diff --git a/tools/genenv b/tools/genenv index 0bfc109920..36535ab3f7 100644 --- a/tools/genenv +++ b/tools/genenv @@ -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 <