From 9fe28bd22018bc140b5202786a3cecd6337ca973 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 27 Aug 2015 18:54:29 -0700
Subject: Move scripts for nova to docker_templates

Change-Id: If00f0f2e3258b7b2876b42b4fbda3681c49c8127
Partially-Implements: blueprint remove-docker-dir
---
 docker_templates/nova/nova-compute/config-external.sh | 11 ++++++++++-
 docker_templates/nova/nova-compute/start.sh           | 14 +++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)
 mode change 120000 => 100755 docker_templates/nova/nova-compute/config-external.sh
 mode change 120000 => 100755 docker_templates/nova/nova-compute/start.sh

(limited to 'docker_templates/nova/nova-compute')

diff --git a/docker_templates/nova/nova-compute/config-external.sh b/docker_templates/nova/nova-compute/config-external.sh
deleted file mode 120000
index f04828004..000000000
--- a/docker_templates/nova/nova-compute/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-compute/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-compute/config-external.sh b/docker_templates/nova/nova-compute/config-external.sh
new file mode 100755
index 000000000..e844bf50c
--- /dev/null
+++ b/docker_templates/nova/nova-compute/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-compute/nova.conf"
+TARGET="/etc/nova/nova.conf"
+OWNER="nova"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/nova/nova-compute/start.sh b/docker_templates/nova/nova-compute/start.sh
deleted file mode 120000
index 6745e03e6..000000000
--- a/docker_templates/nova/nova-compute/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../docker/common/nova/nova-compute/start.sh
\ No newline at end of file
diff --git a/docker_templates/nova/nova-compute/start.sh b/docker_templates/nova/nova-compute/start.sh
new file mode 100755
index 000000000..48e77542b
--- /dev/null
+++ b/docker_templates/nova/nova-compute/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/nova-compute"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
-- 
cgit v1.2.3