openstack/kolla
Code Issues Proposed changes

Ubuntu - Murano

Browse Source 
Change-Id: Ie0fb8c57a1e8c67fc8b8c219ceb15a2c3e2e0f35
Partially-Implements: blueprint install-from-ubuntu
This commit is contained in:
Sam Yaple 2015-08-23 10:00:40 +00:00
parent 44aa4af5f5
commit a5ceb87777
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker_templates/murano/murano-api/Dockerfile.j2
View File

@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY config-external.sh /opt/kolla/
COPY start.sh /
CMD ["/start.sh"]

12
docker_templates/murano/murano-base/Dockerfile.j2
View File

@ -8,16 +8,16 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
ADD ./murano.tar /
ADD murano.tar /
RUN ln -s /murano-* /murano
RUN cd /murano \
&& useradd --user-group murano \
&& pip install -r requirements.txt \
&& pip install /murano \
&& mkdir /etc/murano \
&& cd /murano \
&& tox -e genconfig \
&& cp -r etc/murano/* /etc/murano/ \
&& pip install --install-option="--install-scripts=/usr/bin" /murano \
&& mkdir -p /etc/murano /var/log/murano /home/murano \
&& cp -r /murano/etc/murano/* /etc/murano/ \
&& chown -R murano: /etc/murano /var/log/murano /home/murano \
&& rm -rf /root/.cache
{% endif %}

1
docker_templates/murano/murano-engine/Dockerfile.j2
View File

@ -2,7 +2,6 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY config-external.sh /opt/kolla/
COPY start.sh /
CMD ["/start.sh"]