diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-10 21:50:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-10 21:50:46 +0000 |
| commit | 89938f9b67b90cd579d1f3246a0b55bc9e71b6c9 (patch) | |
| tree | 079753058e989b98d597c0158001e15c10e18085 | |
| parent | a28b246259ee45d54d036d1db3d6ca19318fbafc (diff) | |
| parent | 0cca862991dee6b1adb5e3052450e676fd928fd8 (diff) | |
| download | kolla-89938f9b67b90cd579d1f3246a0b55bc9e71b6c9.tar.gz kolla-89938f9b67b90cd579d1f3246a0b55bc9e71b6c9.zip | |
Merge "Update gnocchi for centos binary"
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | tests/test_build.py | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index e5c98d4aa..67800ef91 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -2,10 +2,13 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false +RUN yum install -y \ + openstack-gnocchi-common \ + && yum clean all + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['ubuntu', 'debian'] %} diff --git a/tests/test_build.py b/tests/test_build.py index 829f45234..df089e941 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -67,8 +67,7 @@ class BuildTest(object): class BuildTestCentosBinary(BuildTest, base.BaseTestCase): - excluded_images = ["gnocchi-base", - "murano-base", + excluded_images = ["murano-base", "ironic-pxe", "ironic-inspector", "mistral-base", @@ -103,8 +102,7 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase): class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): - excluded_images = ["gnocchi-base", - "murano-base", + excluded_images = ["murano-base", "ironic-pxe", "ironic-inspector", "mistral-base", |