From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001 From: Sam Yaple 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-api/Dockerfile.j2 | 18 -------- docker_templates/nova/nova-api/config-external.sh | 10 ----- docker_templates/nova/nova-api/start.sh | 20 --------- docker_templates/nova/nova-base/Dockerfile.j2 | 50 ---------------------- docker_templates/nova/nova-compute/Dockerfile.j2 | 34 --------------- .../nova/nova-compute/config-external.sh | 10 ----- docker_templates/nova/nova-compute/start.sh | 13 ------ docker_templates/nova/nova-conductor/Dockerfile.j2 | 19 -------- .../nova/nova-conductor/config-external.sh | 10 ----- docker_templates/nova/nova-conductor/start.sh | 13 ------ .../nova/nova-consoleauth/Dockerfile.j2 | 18 -------- .../nova/nova-consoleauth/config-external.sh | 10 ----- docker_templates/nova/nova-consoleauth/start.sh | 13 ------ docker_templates/nova/nova-libvirt/Dockerfile.j2 | 32 -------------- .../nova/nova-libvirt/config-external.sh | 10 ----- docker_templates/nova/nova-libvirt/start.sh | 20 --------- docker_templates/nova/nova-network/Dockerfile.j2 | 28 ------------ .../nova/nova-network/config-external.sh | 10 ----- docker_templates/nova/nova-network/start.sh | 13 ------ .../nova/nova-novncproxy/Dockerfile.j2 | 34 --------------- .../nova/nova-novncproxy/config-external.sh | 10 ----- docker_templates/nova/nova-novncproxy/start.sh | 13 ------ docker_templates/nova/nova-scheduler/Dockerfile.j2 | 18 -------- .../nova/nova-scheduler/config-external.sh | 10 ----- docker_templates/nova/nova-scheduler/start.sh | 13 ------ 25 files changed, 449 deletions(-) delete mode 100644 docker_templates/nova/nova-api/Dockerfile.j2 delete mode 100755 docker_templates/nova/nova-api/config-external.sh delete mode 100755 docker_templates/nova/nova-api/start.sh delete mode 100644 docker_templates/nova/nova-base/Dockerfile.j2 delete mode 100644 docker_templates/nova/nova-compute/Dockerfile.j2 delete mode 100755 docker_templates/nova/nova-compute/config-external.sh delete mode 100755 docker_templates/nova/nova-compute/start.sh delete mode 100644 docker_templates/nova/nova-conductor/Dockerfile.j2 delete mode 100755 docker_templates/nova/nova-conductor/config-external.sh delete mode 100755 docker_templates/nova/nova-conductor/start.sh delete mode 100644 docker_templates/nova/nova-consoleauth/Dockerfile.j2 delete mode 100755 docker_templates/nova/nova-consoleauth/config-external.sh delete mode 100755 docker_templates/nova/nova-consoleauth/start.sh 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 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 delete mode 100644 docker_templates/nova/nova-novncproxy/Dockerfile.j2 delete mode 100755 docker_templates/nova/nova-novncproxy/config-external.sh delete mode 100755 docker_templates/nova/nova-novncproxy/start.sh delete mode 100644 docker_templates/nova/nova-scheduler/Dockerfile.j2 delete mode 100755 docker_templates/nova/nova-scheduler/config-external.sh delete mode 100755 docker_templates/nova/nova-scheduler/start.sh (limited to 'docker_templates/nova') diff --git a/docker_templates/nova/nova-api/Dockerfile.j2 b/docker_templates/nova/nova-api/Dockerfile.j2 deleted file mode 100644 index b906d1937..000000000 --- a/docker_templates/nova/nova-api/Dockerfile.j2 +++ /dev/null @@ -1,18 +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-api \ - && 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-api/config-external.sh b/docker_templates/nova/nova-api/config-external.sh deleted file mode 100755 index d0859893d..000000000 --- a/docker_templates/nova/nova-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-api/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-api/start.sh b/docker_templates/nova/nova-api/start.sh deleted file mode 100755 index ad25ba65c..000000000 --- a/docker_templates/nova/nova-api/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-api" -ARGS="" - -# 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 "nova-manage db sync" nova - exit 0 -fi - -exec $CMD $ARGS diff --git a/docker_templates/nova/nova-base/Dockerfile.j2 b/docker_templates/nova/nova-base/Dockerfile.j2 deleted file mode 100644 index b46a446d4..000000000 --- a/docker_templates/nova/nova-base/Dockerfile.j2 +++ /dev/null @@ -1,50 +0,0 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-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-common \ - python-keystoneclient \ - python-cinderclient \ - python-nova \ - bridge-utils \ - && yum clean all - - {% elif base_distro in ['ubuntu', 'debian'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} -{% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} - -RUN yum -y install \ - bridge-utils \ - && yum clean all - - {% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get install -y --no-install-recommends \ - iptables \ - ebtables \ - dnsmasq \ - bridge-utils \ - python-libvirt \ - openssh-client \ - openvswitch-switch \ - && apt-get clean - - {% endif %} - -ADD nova.tar / -RUN ln -s /nova-* nova \ - && useradd --user-group nova \ - && pip --no-cache-dir install /nova \ - && mkdir -p /etc/nova /var/log/nova /home/nova \ - && cp -r /nova/etc/nova/* /etc/nova/ \ - && chown -R nova: /etc/nova /var/log/nova /home/nova - -{% endif %} diff --git a/docker_templates/nova/nova-compute/Dockerfile.j2 b/docker_templates/nova/nova-compute/Dockerfile.j2 deleted file mode 100644 index a8a719023..000000000 --- a/docker_templates/nova/nova-compute/Dockerfile.j2 +++ /dev/null @@ -1,34 +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-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_templates/nova/nova-compute/config-external.sh b/docker_templates/nova/nova-compute/config-external.sh deleted file mode 100755 index e844bf50c..000000000 --- a/docker_templates/nova/nova-compute/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 100755 index 48e77542b..000000000 --- a/docker_templates/nova/nova-compute/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 diff --git a/docker_templates/nova/nova-conductor/Dockerfile.j2 b/docker_templates/nova/nova-conductor/Dockerfile.j2 deleted file mode 100644 index 0f42df5c9..000000000 --- a/docker_templates/nova/nova-conductor/Dockerfile.j2 +++ /dev/null @@ -1,19 +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-conductor \ - && 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-conductor/config-external.sh b/docker_templates/nova/nova-conductor/config-external.sh deleted file mode 100755 index ea3b123ec..000000000 --- a/docker_templates/nova/nova-conductor/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-conductor/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-conductor/start.sh b/docker_templates/nova/nova-conductor/start.sh deleted file mode 100755 index 1fe7d0586..000000000 --- a/docker_templates/nova/nova-conductor/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-conductor" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker_templates/nova/nova-consoleauth/Dockerfile.j2 b/docker_templates/nova/nova-consoleauth/Dockerfile.j2 deleted file mode 100644 index 1c8d9ea12..000000000 --- a/docker_templates/nova/nova-consoleauth/Dockerfile.j2 +++ /dev/null @@ -1,18 +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-console \ - && 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-consoleauth/config-external.sh b/docker_templates/nova/nova-consoleauth/config-external.sh deleted file mode 100755 index 1da10d83f..000000000 --- a/docker_templates/nova/nova-consoleauth/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-consoleauth/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-consoleauth/start.sh b/docker_templates/nova/nova-consoleauth/start.sh deleted file mode 100755 index 1abccde19..000000000 --- a/docker_templates/nova/nova-consoleauth/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-consoleauth" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS 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 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 diff --git a/docker_templates/nova/nova-novncproxy/Dockerfile.j2 b/docker_templates/nova/nova-novncproxy/Dockerfile.j2 deleted file mode 100644 index b798e00a6..000000000 --- a/docker_templates/nova/nova-novncproxy/Dockerfile.j2 +++ /dev/null @@ -1,34 +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 \ - novnc \ - openstack-nova-novncproxy \ - && yum clean all - - {% endif %} -{% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} - -RUN yum -y install \ - https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \ - novnc \ - && yum clean all - - {% elif base_distro in ['ubuntu', 'debian'] %} - -ADD novnc.tar / -RUN ln -s /kanaka-noVNC-* /usr/share/novnc - - {% endif %} -{% endif %} - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] - -{{ include_footer }} diff --git a/docker_templates/nova/nova-novncproxy/config-external.sh b/docker_templates/nova/nova-novncproxy/config-external.sh deleted file mode 100755 index fdc33a5bd..000000000 --- a/docker_templates/nova/nova-novncproxy/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-novncproxy/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-novncproxy/start.sh b/docker_templates/nova/nova-novncproxy/start.sh deleted file mode 100755 index 6e59d1253..000000000 --- a/docker_templates/nova/nova-novncproxy/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-novncproxy" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker_templates/nova/nova-scheduler/Dockerfile.j2 b/docker_templates/nova/nova-scheduler/Dockerfile.j2 deleted file mode 100644 index 5dd0fd507..000000000 --- a/docker_templates/nova/nova-scheduler/Dockerfile.j2 +++ /dev/null @@ -1,18 +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-scheduler \ - && 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-scheduler/config-external.sh b/docker_templates/nova/nova-scheduler/config-external.sh deleted file mode 100755 index 3df0f9b7b..000000000 --- a/docker_templates/nova/nova-scheduler/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/nova-scheduler/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-scheduler/start.sh b/docker_templates/nova/nova-scheduler/start.sh deleted file mode 100755 index d9b3e14eb..000000000 --- a/docker_templates/nova/nova-scheduler/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/nova-scheduler" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS -- cgit v1.2.3