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-libvirt/Dockerfile.j2   | 32 ----------------------
 .../nova/nova-libvirt/config-external.sh           | 10 -------
 docker_templates/nova/nova-libvirt/start.sh        | 20 --------------
 3 files changed, 62 deletions(-)
 delete mode 100644 docker_templates/nova/nova-libvirt/Dockerfile.j2
 delete mode 100755 docker_templates/nova/nova-libvirt/config-external.sh
 delete mode 100755 docker_templates/nova/nova-libvirt/start.sh

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

diff --git a/docker_templates/nova/nova-libvirt/Dockerfile.j2 b/docker_templates/nova/nova-libvirt/Dockerfile.j2
deleted file mode 100644
index 5ff525426..000000000
--- a/docker_templates/nova/nova-libvirt/Dockerfile.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install \
-        libvirt-daemon \
-        libguestfs \
-        qemu-system-x86 \
-        libvirt-daemon-driver-nwfilter \
-        libvirt-daemon-config-nwfilter \
-        libvirt-daemon-driver-lxc \
-    && yum clean all
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get install -y --no-install-recommends \
-        libvirt-bin \
-        dmidecode \
-        pm-utils \
-        qemu \
-        ebtables \
-    && apt-get clean
-
-{% endif %}
-
-COPY start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/nova/nova-libvirt/config-external.sh b/docker_templates/nova/nova-libvirt/config-external.sh
deleted file mode 100755
index acc1c5473..000000000
--- a/docker_templates/nova/nova-libvirt/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/libvirt/libvirtd.conf"
-TARGET="/etc/libvirt/libvirtd.conf"
-OWNER="libvirt"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/nova/nova-libvirt/start.sh b/docker_templates/nova/nova-libvirt/start.sh
deleted file mode 100755
index ae0de867b..000000000
--- a/docker_templates/nova/nova-libvirt/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/sbin/libvirtd"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-# TODO(SamYaple): Tweak libvirt.conf rather than change permissions.
-# Fix permissions for libvirt
-if [[ -c /dev/kvm ]]; then
-    chmod 660 /dev/kvm
-    chown root:kvm /dev/kvm
-fi
-
-exec $CMD $ARGS
-- 
cgit v1.2.3