From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 28 Aug 2015 12:16:53 +0000
Subject: Move docker_templates to docker dir

Updated build.py to reflect this change.
Deprecate --template option and make it a noop.

Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2
Partially-Implements: blueprint remove-docker-dir
---
 docker_templates/nova/nova-network/Dockerfile.j2   | 28 ----------------------
 .../nova/nova-network/config-external.sh           | 10 --------
 docker_templates/nova/nova-network/start.sh        | 13 ----------
 3 files changed, 51 deletions(-)
 delete mode 100644 docker_templates/nova/nova-network/Dockerfile.j2
 delete mode 100755 docker_templates/nova/nova-network/config-external.sh
 delete mode 100755 docker_templates/nova/nova-network/start.sh

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

diff --git a/docker_templates/nova/nova-network/Dockerfile.j2 b/docker_templates/nova/nova-network/Dockerfile.j2
deleted file mode 100644
index 60ea394aa..000000000
--- a/docker_templates/nova/nova-network/Dockerfile.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install \
-        openstack-nova-network \
-        bridge-utils \
-        initscripts \
-    && yum clean all
-
-    {% endif %}
-{% elif install_type == 'source' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install initscripts \
-    && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/nova/nova-network/config-external.sh b/docker_templates/nova/nova-network/config-external.sh
deleted file mode 100755
index 7c1d6bb37..000000000
--- a/docker_templates/nova/nova-network/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-network/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-network/start.sh b/docker_templates/nova/nova-network/start.sh
deleted file mode 100755
index 88f941b33..000000000
--- a/docker_templates/nova/nova-network/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-network"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
-- 
cgit v1.2.3