From f0a349f8103849dee5eca4cdc769292e498cfe29 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 14 Aug 2015 21:53:42 -0700 Subject: [PATCH] Add heat to docker_templates This adds Heat to the docker_templates directory. Change-Id: I836d35515c71842f01974e9ae4dd934f3f4114f9 Partially-Implements: blueprint dockerfile-template --- .../heat/heat-api-cfn/Dockerfile.j2 | 23 ++++++++++++++ .../heat/heat-api-cfn/config-external.sh | 1 + docker_templates/heat/heat-api-cfn/start.sh | 1 + docker_templates/heat/heat-api/Dockerfile.j2 | 23 ++++++++++++++ .../heat/heat-api/config-external.sh | 1 + docker_templates/heat/heat-api/start.sh | 1 + docker_templates/heat/heat-base/Dockerfile.j2 | 31 +++++++++++++++++++ .../heat/heat-engine/Dockerfile.j2 | 26 ++++++++++++++++ .../heat/heat-engine/config-external.sh | 1 + docker_templates/heat/heat-engine/start.sh | 1 + 10 files changed, 109 insertions(+) create mode 100644 docker_templates/heat/heat-api-cfn/Dockerfile.j2 create mode 120000 docker_templates/heat/heat-api-cfn/config-external.sh create mode 120000 docker_templates/heat/heat-api-cfn/start.sh create mode 100644 docker_templates/heat/heat-api/Dockerfile.j2 create mode 120000 docker_templates/heat/heat-api/config-external.sh create mode 120000 docker_templates/heat/heat-api/start.sh create mode 100644 docker_templates/heat/heat-base/Dockerfile.j2 create mode 100644 docker_templates/heat/heat-engine/Dockerfile.j2 create mode 120000 docker_templates/heat/heat-engine/config-external.sh create mode 120000 docker_templates/heat/heat-engine/start.sh diff --git a/docker_templates/heat/heat-api-cfn/Dockerfile.j2 b/docker_templates/heat/heat-api-cfn/Dockerfile.j2 new file mode 100644 index 0000000000..6bebe6227d --- /dev/null +++ b/docker_templates/heat/heat-api-cfn/Dockerfile.j2 @@ -0,0 +1,23 @@ +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-heat-api-cfn \ + python-openstackclient \ + && yum clean all + + {% elif base_distro in ['ubuntu', 'debian'] %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} +{% endif %} + +COPY start.sh / +COPY config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker_templates/heat/heat-api-cfn/config-external.sh b/docker_templates/heat/heat-api-cfn/config-external.sh new file mode 120000 index 0000000000..3554b955f6 --- /dev/null +++ b/docker_templates/heat/heat-api-cfn/config-external.sh @@ -0,0 +1 @@ +../../../docker/common/heat/heat-api-cfn/config-external.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-api-cfn/start.sh b/docker_templates/heat/heat-api-cfn/start.sh new file mode 120000 index 0000000000..a432274f72 --- /dev/null +++ b/docker_templates/heat/heat-api-cfn/start.sh @@ -0,0 +1 @@ +../../../docker/common/heat/heat-api-cfn/start.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-api/Dockerfile.j2 b/docker_templates/heat/heat-api/Dockerfile.j2 new file mode 100644 index 0000000000..49552127ac --- /dev/null +++ b/docker_templates/heat/heat-api/Dockerfile.j2 @@ -0,0 +1,23 @@ +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-heat-api \ + python-openstackclient \ + && yum clean all + + {% elif base_distro in ['ubuntu', 'debian'] %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} +{% endif %} + +COPY start.sh / +COPY config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker_templates/heat/heat-api/config-external.sh b/docker_templates/heat/heat-api/config-external.sh new file mode 120000 index 0000000000..72176b1a0c --- /dev/null +++ b/docker_templates/heat/heat-api/config-external.sh @@ -0,0 +1 @@ +../../../docker/common/heat/heat-api/config-external.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-api/start.sh b/docker_templates/heat/heat-api/start.sh new file mode 120000 index 0000000000..c0584ab542 --- /dev/null +++ b/docker_templates/heat/heat-api/start.sh @@ -0,0 +1 @@ +../../../docker/common/heat/heat-api/start.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-base/Dockerfile.j2 b/docker_templates/heat/heat-base/Dockerfile.j2 new file mode 100644 index 0000000000..bd84be5baf --- /dev/null +++ b/docker_templates/heat/heat-base/Dockerfile.j2 @@ -0,0 +1,31 @@ +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 \ + python-oslo-reports \ + && 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' %} + +ADD ./heat.tar / +RUN ln -s /heat-* /heat + +RUN cd /heat \ + && useradd --user-group heat \ + && pip install -r requirements.txt \ + && pip install /heat \ + && mkdir /etc/heat /var/www/cgi-bin/heat \ + && cp -r /heat/etc/* /etc/heat/ \ + && cp -a httpd/heat.py /var/www/cgi-bin/heat/admin \ + && cp -a httpd/heat.py /var/www/cgi-bin/heat/main + +{% endif %} diff --git a/docker_templates/heat/heat-engine/Dockerfile.j2 b/docker_templates/heat/heat-engine/Dockerfile.j2 new file mode 100644 index 0000000000..60ee1b6964 --- /dev/null +++ b/docker_templates/heat/heat-engine/Dockerfile.j2 @@ -0,0 +1,26 @@ +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 \ + # until http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248 \ + # is updated, the clients must remain here: \ + python-barbicanclient \ + python-zaqarclient \ + openstack-heat-engine \ + && yum clean all + + {% elif base_distro in ['ubuntu', 'debian'] %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} +{% endif %} + +COPY start.sh / +COPY config-external.sh /opt/kolla/ + +CMD ["/start.sh"] diff --git a/docker_templates/heat/heat-engine/config-external.sh b/docker_templates/heat/heat-engine/config-external.sh new file mode 120000 index 0000000000..1e03e6c3b4 --- /dev/null +++ b/docker_templates/heat/heat-engine/config-external.sh @@ -0,0 +1 @@ +../../../docker/common/heat/heat-engine/config-external.sh \ No newline at end of file diff --git a/docker_templates/heat/heat-engine/start.sh b/docker_templates/heat/heat-engine/start.sh new file mode 120000 index 0000000000..5de8025b53 --- /dev/null +++ b/docker_templates/heat/heat-engine/start.sh @@ -0,0 +1 @@ +../../../docker/common/heat/heat-engine/start.sh \ No newline at end of file