diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 5a4777d81f8a726196f6d7f875226a038771383b..7c526dbb9129ecd9f5f1fca1c70879ea3f1ed203 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 3c74f56514d96a0208bcaab38d64a4c2c7511f2e..968649c66a556d91c79b1909fac5701c09c9d79e 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 0d65c45b1074ec9186703a897856109b0cb3af75..8178c2903bc97976219fc1dbca7eda40d69ac03c 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 90594ea8b2f51f89ed8f948705f066b2f2fbfe3b..f36fb2b0d6bae5d0f79b6851efe51a8ba11f6e91 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 b6e02da38df4335d5758481d6af943489f24b98a..64bc6c71b29dd6015fa56994f8f9fcbdadbeb9bd 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 2fd354da2a45bb18cb565fab2de94f61457052d7..ada653a3be7bb9636a160620d4d52d127e4e6b3b 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 %}