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/nova/nova-compute/Dockerfile.j2      | 34 +++++++++++++++++++++++++++++
 docker/nova/nova-compute/config-external.sh | 10 +++++++++
 docker/nova/nova-compute/start.sh           | 13 +++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 docker/nova/nova-compute/Dockerfile.j2
 create mode 100755 docker/nova/nova-compute/config-external.sh
 create mode 100755 docker/nova/nova-compute/start.sh

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

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
new file mode 100644
index 000000000..a8a719023
--- /dev/null
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -0,0 +1,34 @@
+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-compute \
+        openvswitch \
+        sysfsutils \
+    && yum clean all
+
+    {% endif %}
+{% elif install_type == 'source' %}
+    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+
+RUN yum -y install \
+        sysfsutils \
+        libvirt-python \
+    && yum clean all
+
+    {% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN apt-get install -y --no-install-recommends qemu-utils \
+    && apt-get clean
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/nova/nova-compute/config-external.sh b/docker/nova/nova-compute/config-external.sh
new file mode 100755
index 000000000..e844bf50c
--- /dev/null
+++ b/docker/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/nova/nova-compute/start.sh b/docker/nova/nova-compute/start.sh
new file mode 100755
index 000000000..48e77542b
--- /dev/null
+++ b/docker/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