openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source 
Many of these were actually files containing the path to the real
script, instead of being symlinks.

config-{internal,external}.sh files in openvswitch/ovs-base were not
needed and were thus deleted.

Also update minimal-environment-vars.md after symlinks were fixed.

Change-Id: I11c3e735067b1feb83c3184c32333e598fbdf590
Closes-Bug: #1474227
This commit is contained in:
Martin André
2015-07-14 16:37:45 +09:00
parent 37ca7222bb
commit 9becd325cd
10 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docker/centos/binary/magnum/magnum-api/config-external.sh
View File

@@ -1 +0,0 @@
../../../../common/magnum/magnum-api/config-external.sh

1
docker/centos/binary/magnum/magnum-api/config-external.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/magnum/magnum-api/config-external.sh

1
docker/centos/binary/magnum/magnum-api/config-internal.sh
View File

@@ -1 +0,0 @@
../../../../common/magnum/magnum-api/config-internal.sh

1
docker/centos/binary/magnum/magnum-api/config-internal.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/magnum/magnum-api/config-internal.sh

1
docker/centos/binary/magnum/magnum-conductor/config-external.sh
View File

@@ -1 +0,0 @@
../../../../common/magnum/magnum-conductor/config-external.sh

1
docker/centos/binary/magnum/magnum-conductor/config-external.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/magnum/magnum-conductor/config-external.sh

1
docker/centos/binary/magnum/magnum-conductor/config-internal.sh
View File

@@ -1 +0,0 @@
../../../../common/magnum/magnum-conductor/config-internal.sh

1
docker/centos/binary/magnum/magnum-conductor/config-internal.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/magnum/magnum-conductor/config-internal.sh

2
docker/centos/binary/openvswitch/ovs-base/Dockerfile
View File

@@ -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/

1
docker/centos/binary/openvswitch/ovs-base/config-external.sh
View File

@@ -1 +0,0 @@
../../../../common/openvswitch/ovs-base/config-external.sh

1
docker/centos/binary/openvswitch/ovs-base/config-internal.sh
View File

@@ -1 +0,0 @@
../../../../common/openvswitch/ovs-base/config-external.sh

1
docker/centos/binary/zaqar/config-external.sh
View File

@@ -1 +0,0 @@
../../../../common/zaqar/config-external.sh

1
docker/centos/binary/zaqar/config-external.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../common/zaqar/config-external.sh

1
docker/centos/binary/zaqar/config-internal.sh
View File

@@ -1 +0,0 @@
../../../../common/zaqar/config-internal.sh

1
docker/centos/binary/zaqar/config-internal.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../common/zaqar/config-internal.sh

20
docs/minimal-environment-vars.md
View File

@@ -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