Merge "Designate ubuntu binary container"

7 files changed, 46 insertions, 2 deletions

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index e5713ddd1..0f20163ca 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -5,9 +5,15 @@ MAINTAINER {{ maintainer }}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
 RUN yum install -y \
-    openstack-designate-api \
+        openstack-designate-api \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        designate-api \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index 898011a48..6ed56cb7a 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -9,6 +9,12 @@ RUN yum install -y bind \
     && mkdir -p /var/lib/kolla/ \
     && cp -pr /var/named /var/lib/kolla/var-named
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        bind9 \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index d641da39a..ede5256a6 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -9,7 +9,6 @@ MAINTAINER {{ maintainer }}
 # need the complete policy file because of some of the containers'
 # requiring it. Remove the package when the file is moved though.
 RUN yum install -y \
-        openstack-designate-api \
         openstack-designate-common \
         python-tooz \
     && yum clean all \
@@ -17,6 +16,13 @@ RUN yum install -y \
     && rpm -e openstack-designate-api \
     && mv /tmp/policy.json /etc/designate/
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        designate-common \
+        python-tooz \
+    && apt-get clean
+
     {% endif %}
 {% elif install_type == 'source' %}
 
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index c4571c834..dfd67978e 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum install -y openstack-designate-central \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu']%}
+
+RUN apt-get install -y --no-install-recommends \
+        designate-central \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index 9757709aa..2ed4386af 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum install -y openstack-designate-mdns \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        designate-mdns \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2
index e8c218e03..9cad51c89 100644
--- a/docker/designate/designate-poolmanager/Dockerfile.j2
+++ b/docker/designate/designate-poolmanager/Dockerfile.j2
@@ -10,6 +10,13 @@ RUN yum install -y \
         bind \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        designate-pool-manager \
+        bind9 \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 732c1fa45..0e7addd07 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -9,6 +9,13 @@ RUN yum install -y \
         python-designateclient \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y -no-install-recommends \
+        designate-sink \
+        designateclient \
+    && apt-get clean
+
     {% endif %}
 {% endif %}