Merge "Manila ubuntu binary container"

docker/manila/manila-api/Dockerfile.j2

 FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% if install_type == 'binary' %}
+    {% if base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        manila-api \
+    && apt-get clean
+
+    {% endif%}
+{% endif%}
+
 COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
 RUN chmod 755 /usr/local/bin/kolla_manila_extend_start
 

docker/manila/manila-base/Dockerfile.j2

@@ -12,6 +12,7 @@ RUN yum -y install \
     {% elif base_distro in ['ubuntu'] %}
 
 RUN apt-get install -y --no-install-recommends \
+        manila-common \
         openvswitch-switch \
     && apt-get clean
 

docker/manila/manila-scheduler/Dockerfile.j2

 FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% if install_type == 'binary' %}
+    {% if base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        manila-scheduler \
+    && apt-get clean
+
+    {% endif%}
+{% endif%}
+
 {{ include_footer }}
 
 USER manila