Remove service_hosts.sh

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

Change-Id: I23954bf148923fbe785f51012fc9c9da909fa380
Closes-Bug: #1447867

19 files changed, 8 insertions, 64 deletions

diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile
index 4cac35598..1003d8df2 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 06e045440..000000000
--- 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 cc5ed43f7..91e19915f 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 06e045440..000000000
--- 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 5c07b375d..d3babfc26 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 c3006f720..000000000
--- 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 21e998e11..2b6776d35 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 06e045440..000000000
--- 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 04afcdc72..367e37a47 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 06e045440..000000000
--- 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 bdc9f5428..169cb5f3a 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 06e045440..000000000
--- 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 1dd76d39e..f75e56328 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 06e045440..000000000
--- 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 06e045440..000000000
--- 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 e5e0f5242..dbe5e97dd 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 06e045440..000000000
--- 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 c0049b53d..667f3832a 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 06e045440..000000000
--- a/docker/ubuntu/source/base/service_hosts.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/base/service_hosts.sh
\ No newline at end of file