From 73a356e951865d508e4d527ff4a054e8602143b9 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Sun, 23 Aug 2015 10:38:50 +0000
Subject: [PATCH] Ubuntu - Gnocchi
Change-Id: I3d8ddf5b54d79d66fd74ed85e9cc65b0ce7201c0
Partially-Implements: blueprint install-from-ubuntu
---
docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 | 7 ++++---
docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 | 13 +++++++++----
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2 b/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2
index 93d8214764..9bb144ed71 100644
--- a/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2
@@ -4,9 +4,10 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-RUN yum install -y openstack-gnocchi-api \
- openstack-gnocchi-carbonara \
- openstack-gnocchi-indexer-sqlalchemy \
+RUN yum install -y \
+ openstack-gnocchi-api \
+ openstack-gnocchi-carbonara \
+ openstack-gnocchi-indexer-sqlalchemy \
&& yum clean all
{% endif %}
diff --git a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2 b/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2
index db82205244..49cf68efb9 100644
--- a/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker_templates/gnocchi/gnocchi-base/Dockerfile.j2
@@ -2,13 +2,17 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
- {% if 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 ['ubuntu', 'debian'] %}
+
+RUN apt-get install -y --no-install-recommends libpq-dev \
+ && apt-get clean
+
+ {% endif %}
ADD ./gnocchi.tar /
RUN ln -s /gnocchi-* /gnocchi
@@ -16,9 +20,10 @@ RUN ln -s /gnocchi-* /gnocchi
RUN cd /gnocchi \
&& useradd --user-group gnocchi \
&& pip install -r requirements.txt \
- && pip install /gnocchi \
- && mkdir /etc/gnocchi /var/log/gnocchi \
+ && pip install --install-option="--install-scripts=/usr/bin" /gnocchi \
+ && mkdir -p /etc/gnocchi /var/log/gnocchi /home/gnocchi \
&& cp -r /gnocchi/etc/* /etc/gnocchi/ \
+ && chown -R gnocchi: /etc/gnocchi /var/log/gnocchi /home/gnocchi \
&& rm -rf /root/.cache
{% endif %}