From fd6bfd329e95b736c536d95ae095be12bd791fb0 Mon Sep 17 00:00:00 2001 From: MD NADEEM Date: Tue, 16 Feb 2016 12:01:14 +0530 Subject: [PATCH] Aodh ubuntu binary container Change-Id: I636e6954855a8f94d5ea15216d892c1bff53b7a8 Partially-Implements: blueprint binary-ubuntu --- docker/aodh/aodh-api/Dockerfile.j2 | 6 ++++++ docker/aodh/aodh-base/Dockerfile.j2 | 6 ++++++ docker/aodh/aodh-evaluator/Dockerfile.j2 | 6 ++++++ docker/aodh/aodh-expirer/Dockerfile.j2 | 6 ++++++ docker/aodh/aodh-listener/Dockerfile.j2 | 6 ++++++ docker/aodh/aodh-notifier/Dockerfile.j2 | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 5a4777d81f..7c526dbb91 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 3c74f56514..968649c66a 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 0d65c45b10..8178c2903b 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 90594ea8b2..f36fb2b0d6 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 b6e02da38d..64bc6c71b2 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 2fd354da2a..ada653a3be 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 %}