Merge "Fix symlinks to config-{internal,external}.sh"

10 files changed, 23 insertions, 13 deletions

diff --git a/docker/centos/binary/magnum/magnum-api/config-external.sh b/docker/centos/binary/magnum/magnum-api/config-external.sh
index 51d63c9ec..746e2aa58 100644..120000
--- a/docker/centos/binary/magnum/magnum-api/config-external.sh
+++ b/docker/centos/binary/magnum/magnum-api/config-external.sh
@@ -1 +1 @@
-../../../../common/magnum/magnum-api/config-external.sh
+../../../../common/magnum/magnum-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-api/config-internal.sh b/docker/centos/binary/magnum/magnum-api/config-internal.sh
index 3637ccaff..7f9cace39 100644..120000
--- a/docker/centos/binary/magnum/magnum-api/config-internal.sh
+++ b/docker/centos/binary/magnum/magnum-api/config-internal.sh
@@ -1 +1 @@
-../../../../common/magnum/magnum-api/config-internal.sh
+../../../../common/magnum/magnum-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-conductor/config-external.sh b/docker/centos/binary/magnum/magnum-conductor/config-external.sh
index a9ca55e4e..2d3f514d5 100644..120000
--- a/docker/centos/binary/magnum/magnum-conductor/config-external.sh
+++ b/docker/centos/binary/magnum/magnum-conductor/config-external.sh
@@ -1 +1 @@
-../../../../common/magnum/magnum-conductor/config-external.sh
+../../../../common/magnum/magnum-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/magnum/magnum-conductor/config-internal.sh b/docker/centos/binary/magnum/magnum-conductor/config-internal.sh
index b2302e7ae..1d8f73aa9 100644..120000
--- a/docker/centos/binary/magnum/magnum-conductor/config-internal.sh
+++ b/docker/centos/binary/magnum/magnum-conductor/config-internal.sh
@@ -1 +1 @@
-../../../../common/magnum/magnum-conductor/config-internal.sh
+../../../../common/magnum/magnum-conductor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/openvswitch/ovs-base/Dockerfile b/docker/centos/binary/openvswitch/ovs-base/Dockerfile
index 98506b477..7d4ade54c 100644
--- a/docker/centos/binary/openvswitch/ovs-base/Dockerfile
+++ b/docker/centos/binary/openvswitch/ovs-base/Dockerfile
@@ -3,5 +3,3 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum install -y openvswitch \
     && yum clean all
-
-COPY config-internal.sh config-external.sh /opt/kolla/
diff --git a/docker/centos/binary/openvswitch/ovs-base/config-external.sh b/docker/centos/binary/openvswitch/ovs-base/config-external.sh
deleted file mode 100644
index fc177a286..000000000
--- a/docker/centos/binary/openvswitch/ovs-base/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/openvswitch/ovs-base/config-external.sh
diff --git a/docker/centos/binary/openvswitch/ovs-base/config-internal.sh b/docker/centos/binary/openvswitch/ovs-base/config-internal.sh
deleted file mode 100644
index fc177a286..000000000
--- a/docker/centos/binary/openvswitch/ovs-base/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/openvswitch/ovs-base/config-external.sh
diff --git a/docker/centos/binary/zaqar/config-external.sh b/docker/centos/binary/zaqar/config-external.sh
index 3459a6f72..38fff40d1 100644..120000
--- a/docker/centos/binary/zaqar/config-external.sh
+++ b/docker/centos/binary/zaqar/config-external.sh
@@ -1 +1 @@
-../../../../common/zaqar/config-external.sh
+../../../common/zaqar/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/zaqar/config-internal.sh b/docker/centos/binary/zaqar/config-internal.sh
index 10b7affb7..9946142b4 100644..120000
--- a/docker/centos/binary/zaqar/config-internal.sh
+++ b/docker/centos/binary/zaqar/config-internal.sh
@@ -1 +1 @@
-../../../../common/zaqar/config-internal.sh
+../../../common/zaqar/config-internal.sh
\ No newline at end of file
diff --git a/docs/minimal-environment-vars.md b/docs/minimal-environment-vars.md
index cf58435d9..8e11781a3 100644
--- a/docs/minimal-environment-vars.md
+++ b/docs/minimal-environment-vars.md
@@ -300,7 +300,15 @@ In order for each service to function, there is a minimum set of required variab
 
 # Magnum-api
 
-    None
+    ADMIN_TENANT_NAME
+    KEYSTONE_ADMIN_SERVICE_HOST
+    KEYSTONE_ADMIN_SERVICE_PORT
+    KEYSTONE_ADMIN_TOKEN
+    KEYSTONE_AUTH_PROTOCOL
+    MAGNUM_API_SERVICE_HOST
+    MAGNUM_API_SERVICE_PORT
+    MAGNUM_KEYSTONE_PASSWORD
+    MAGNUM_KEYSTONE_USER
 
 # Magnum-base
 
@@ -319,7 +327,9 @@ In order for each service to function, there is a minimum set of required variab
 
 # Magnum-conductor
 
-    None
+    MAGNUM_DB_NAME
+    MAGNUM_DB_PASSWORD
+    MAGNUM_DB_USER
 
 # Mariadb
 
@@ -493,4 +503,8 @@ In order for each service to function, there is a minimum set of required variab
 
 # Zaqar
 
-    None
+    KEYSTONE_ADMIN_SERVICE_HOST
+    KEYSTONE_ADMIN_TOKEN
+    PUBLIC_IP
+    ZAQAR_KEYSTONE_PASSWORD
+    ZAQAR_SERVER_SERVICE_HOST