diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-19 16:21:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-19 16:21:15 +0000 |
| commit | dd17fc26d601b331392d3a4e1b87ba379dac970c (patch) | |
| tree | 494c0233a22b17f73c641662a3c834682bde6682 | |
| parent | 79ecb88220b78a38abf08d8fdbda82fbf5173c91 (diff) | |
| parent | fd6bfd329e95b736c536d95ae095be12bd791fb0 (diff) | |
| download | kolla-dd17fc26d601b331392d3a4e1b87ba379dac970c.tar.gz kolla-dd17fc26d601b331392d3a4e1b87ba379dac970c.zip | |
Merge "Aodh ubuntu binary container"
| -rw-r--r-- | docker/aodh/aodh-api/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/aodh/aodh-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/aodh/aodh-evaluator/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/aodh/aodh-expirer/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/aodh/aodh-listener/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/aodh/aodh-notifier/Dockerfile.j2 | 6 |
6 files changed, 36 insertions, 0 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 5a4777d81..7c526dbb9 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum install -y openstack-aodh-api \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + aodh-api \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 3c74f5651..968649c66 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -8,6 +8,12 @@ RUN yum -y install \ openstack-aodh-common \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + aodh-common \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index 0d65c45b1..8178c2903 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/docker/aodh/aodh-evaluator/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum install -y openstack-aodh-evaluator \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + aodh-evaluator \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index 90594ea8b..f36fb2b0d 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/docker/aodh/aodh-expirer/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum install -y openstack-aodh-expirer \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + aodh-expirer \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index b6e02da38..64bc6c71b 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/docker/aodh/aodh-listener/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum install -y openstack-aodh-listener\ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + aodh-listener \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index 2fd354da2..ada653a3b 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/docker/aodh/aodh-notifier/Dockerfile.j2 @@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }} RUN yum install -y openstack-aodh-notifier\ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + aodh-notifier \ + && apt-get clean + {% endif %} {% endif %} |