openstack/kolla-ansible
Code Issues Proposed changes

Ubuntu - Gnocchi

Browse Source 
Change-Id: I3d8ddf5b54d79d66fd74ed85e9cc65b0ce7201c0
Partially-Implements: blueprint install-from-ubuntu
This commit is contained in:
Sam Yaple 2015-08-23 10:38:50 +00:00
parent 44aa4af5f5
commit 73a356e951
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker_templates/gnocchi/gnocchi-api/Dockerfile.j2
View File

@ -4,9 +4,10 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
RUN yum install -y openstack-gnocchi-api \ RUN yum install -y \
openstack-gnocchi-carbonara \ openstack-gnocchi-api \
openstack-gnocchi-indexer-sqlalchemy \ openstack-gnocchi-carbonara \
openstack-gnocchi-indexer-sqlalchemy \
&& yum clean all && yum clean all
{% endif %} {% endif %}

13
docker_templates/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -2,13 +2,17 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends libpq-dev \
&& apt-get clean
{% endif %}
ADD ./gnocchi.tar / ADD ./gnocchi.tar /
RUN ln -s /gnocchi-* /gnocchi RUN ln -s /gnocchi-* /gnocchi
@ -16,9 +20,10 @@ RUN ln -s /gnocchi-* /gnocchi
RUN cd /gnocchi \ RUN cd /gnocchi \
&& useradd --user-group gnocchi \ && useradd --user-group gnocchi \
&& pip install -r requirements.txt \ && pip install -r requirements.txt \
&& pip install /gnocchi \ && pip install --install-option="--install-scripts=/usr/bin" /gnocchi \
&& mkdir /etc/gnocchi /var/log/gnocchi \ && mkdir -p /etc/gnocchi /var/log/gnocchi /home/gnocchi \
&& cp -r /gnocchi/etc/* /etc/gnocchi/ \ && cp -r /gnocchi/etc/* /etc/gnocchi/ \
&& chown -R gnocchi: /etc/gnocchi /var/log/gnocchi /home/gnocchi \
&& rm -rf /root/.cache && rm -rf /root/.cache
{% endif %} {% endif %}