From 3ca9ae380ee20a2c9d374ea2ddc0dab2841d859a Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 27 Aug 2015 17:22:44 -0700
Subject: [PATCH] Move kolla-common to bsae directory

Change-Id: Ie48e1d25f06a2b91d608edda7fae54ec1ad80f2a
Partially-Implements: blueprint remove-docker-dir
---
 docker/common/base/kolla-common.sh    | 22 ----------------------
 docker_templates/base/kolla-common.sh | 23 ++++++++++++++++++++++-
 2 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 100644 docker/common/base/kolla-common.sh
 mode change 120000 => 100644 docker_templates/base/kolla-common.sh

diff --git a/docker/common/base/kolla-common.sh b/docker/common/base/kolla-common.sh
deleted file mode 100644
index cc960ca24f..0000000000
--- a/docker/common/base/kolla-common.sh
+++ /dev/null
@@ -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
-}
diff --git a/docker_templates/base/kolla-common.sh b/docker_templates/base/kolla-common.sh
deleted file mode 120000
index 03ffb4e73b..0000000000
--- a/docker_templates/base/kolla-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../docker/common/base/kolla-common.sh
\ No newline at end of file
diff --git a/docker_templates/base/kolla-common.sh b/docker_templates/base/kolla-common.sh
new file mode 100644
index 0000000000..cc960ca24f
--- /dev/null
+++ b/docker_templates/base/kolla-common.sh
@@ -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
+}