From 6434f19ef279f2575e9f0649e9940f88880da424 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 27 Aug 2015 18:27:37 -0700
Subject: [PATCH] Move scripts for murano to docker_templates

Change-Id: I1f7090d22c33891717002297c898cf1b5ddb210c
Partially-Implements: blueprint remove-docker-dir
---
 .../murano/murano-api/config-external.sh      | 10 ---------
 docker/common/murano/murano-api/start.sh      | 20 ------------------
 .../murano/murano-engine/config-external.sh   | 10 ---------
 docker/common/murano/murano-engine/start.sh   | 13 ------------
 .../murano/murano-api/config-external.sh      | 11 +++++++++-
 docker_templates/murano/murano-api/start.sh   | 21 ++++++++++++++++++-
 .../murano/murano-engine/config-external.sh   | 11 +++++++++-
 .../murano/murano-engine/start.sh             | 14 ++++++++++++-
 8 files changed, 53 insertions(+), 57 deletions(-)
 delete mode 100644 docker/common/murano/murano-api/config-external.sh
 delete mode 100755 docker/common/murano/murano-api/start.sh
 delete mode 100644 docker/common/murano/murano-engine/config-external.sh
 delete mode 100755 docker/common/murano/murano-engine/start.sh
 mode change 120000 => 100644 docker_templates/murano/murano-api/config-external.sh
 mode change 120000 => 100755 docker_templates/murano/murano-api/start.sh
 mode change 120000 => 100644 docker_templates/murano/murano-engine/config-external.sh
 mode change 120000 => 100755 docker_templates/murano/murano-engine/start.sh

diff --git a/docker/common/murano/murano-api/config-external.sh b/docker/common/murano/murano-api/config-external.sh
deleted file mode 100644
index 5d9a2da497..0000000000
--- a/docker/common/murano/murano-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/murano/murano.conf"
-TARGET="/etc/murano/murano.conf"
-OWNER="murano"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/murano/murano-api/start.sh b/docker/common/murano/murano-api/start.sh
deleted file mode 100755
index 7d712177d0..0000000000
--- a/docker/common/murano/murano-api/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/murano-api"
-ARGS="--config-file /etc/murano/murano.conf"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    su -s /bin/sh -c "murano-db-manage --config-file /etc/murano/murano.conf upgrade" murano
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker/common/murano/murano-engine/config-external.sh b/docker/common/murano/murano-engine/config-external.sh
deleted file mode 100644
index 5d9a2da497..0000000000
--- a/docker/common/murano/murano-engine/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/murano/murano.conf"
-TARGET="/etc/murano/murano.conf"
-OWNER="murano"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/murano/murano-engine/start.sh b/docker/common/murano/murano-engine/start.sh
deleted file mode 100755
index 22834fc4c1..0000000000
--- a/docker/common/murano/murano-engine/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/murano-engine"
-ARGS="--config-file /etc/murano/murano.conf"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/murano/murano-api/config-external.sh b/docker_templates/murano/murano-api/config-external.sh
deleted file mode 120000
index 508c2d5641..0000000000
--- a/docker_templates/murano/murano-api/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/murano/murano-api/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/murano/murano-api/config-external.sh b/docker_templates/murano/murano-api/config-external.sh
new file mode 100644
index 0000000000..5d9a2da497
--- /dev/null
+++ b/docker_templates/murano/murano-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/murano/murano.conf"
+TARGET="/etc/murano/murano.conf"
+OWNER="murano"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/murano/murano-api/start.sh b/docker_templates/murano/murano-api/start.sh
deleted file mode 120000
index 00416066a9..0000000000
--- a/docker_templates/murano/murano-api/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/murano/murano-api/start.sh
\ No newline at end of file
diff --git a/docker_templates/murano/murano-api/start.sh b/docker_templates/murano/murano-api/start.sh
new file mode 100755
index 0000000000..7d712177d0
--- /dev/null
+++ b/docker_templates/murano/murano-api/start.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/murano-api"
+ARGS="--config-file /etc/murano/murano.conf"
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    su -s /bin/sh -c "murano-db-manage --config-file /etc/murano/murano.conf upgrade" murano
+    exit 0
+fi
+
+exec $CMD $ARGS
diff --git a/docker_templates/murano/murano-engine/config-external.sh b/docker_templates/murano/murano-engine/config-external.sh
deleted file mode 120000
index 7b42bd825d..0000000000
--- a/docker_templates/murano/murano-engine/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/murano/murano-engine/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/murano/murano-engine/config-external.sh b/docker_templates/murano/murano-engine/config-external.sh
new file mode 100644
index 0000000000..5d9a2da497
--- /dev/null
+++ b/docker_templates/murano/murano-engine/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/murano/murano.conf"
+TARGET="/etc/murano/murano.conf"
+OWNER="murano"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/murano/murano-engine/start.sh b/docker_templates/murano/murano-engine/start.sh
deleted file mode 120000
index 160b196265..0000000000
--- a/docker_templates/murano/murano-engine/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/murano/murano-engine/start.sh
\ No newline at end of file
diff --git a/docker_templates/murano/murano-engine/start.sh b/docker_templates/murano/murano-engine/start.sh
new file mode 100755
index 0000000000..22834fc4c1
--- /dev/null
+++ b/docker_templates/murano/murano-engine/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/murano-engine"
+ARGS="--config-file /etc/murano/murano.conf"
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
-- 
GitLab