openstack/kolla-ansible
Code Issues Proposed changes

Move kolla-common to bsae directory

Browse Source 
Change-Id: Ie48e1d25f06a2b91d608edda7fae54ec1ad80f2a
Partially-Implements: blueprint remove-docker-dir
This commit is contained in:
Steven Dake 2015-08-27 17:22:44 -07:00
parent 08e765fc3d
commit 3ca9ae380e
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +0,0 @@
#!/bin/bash
set_configs() {
case $KOLLA_CONFIG_STRATEGY in
COPY_ALWAYS)
source /opt/kolla/config-external.sh
;;
COPY_ONCE)
if [[ -f /configured ]]; then
echo 'INFO - This container has already been configured; Refusing to copy new configs'
else
source /opt/kolla/config-external.sh
touch /configured
fi
;;
*)
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
exit 1
;;
esac
}

1
docker_templates/base/kolla-common.sh
View File

@ -1 +0,0 @@
../../docker/common/base/kolla-common.sh

22
docker_templates/base/kolla-common.sh Normal file
View File

@ -0,0 +1,22 @@
#!/bin/bash
set_configs() {
case $KOLLA_CONFIG_STRATEGY in
COPY_ALWAYS)
source /opt/kolla/config-external.sh
;;
COPY_ONCE)
if [[ -f /configured ]]; then
echo 'INFO - This container has already been configured; Refusing to copy new configs'
else
source /opt/kolla/config-external.sh
touch /configured
fi
;;
*)
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
exit 1
;;
esac
}