build: enable Octavia for Ubuntu/binary

Change-Id: Icc68b404d8713a9fcf0026374378d1645fe30d52

Author: hrw

docker/octavia/octavia-api/Dockerfile.j2

@@ -22,8 +22,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
         {% endif %}
     {% elif base_package_type == 'deb' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-            && /bin/false
+        {% set octavia_api_packages = [
+            'octavia-api',
+            'apache2',
+            'libapache2-mod-wsgi-py3'
+        ] %}
     {% endif %}
 
 

docker/octavia/octavia-base/Dockerfile.j2

@@ -13,8 +13,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openstack-octavia-common'
         ] %}
     {% elif base_package_type == 'deb' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-            && /bin/false
+        {% set octavia_base_packages = [
+            'octavia-common'
+        ] %}
     {% endif %}
 
 {{ macros.install_packages(octavia_base_packages | customizable("packages")) }}

docker/octavia/octavia-health-manager/Dockerfile.j2

@@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openstack-octavia-health-manager'
         ] %}
     {% elif base_package_type == 'deb' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-            && /bin/false
+        {% set octavia_health_manager_packages = [
+            'octavia-health-manager'
+        ] %}
     {% endif %}
 
 {{ macros.install_packages(octavia_health_manager_packages | customizable("packages")) }}

docker/octavia/octavia-housekeeping/Dockerfile.j2

@@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openstack-octavia-housekeeping'
         ] %}
     {% elif base_package_type == 'deb' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-            && /bin/false
+        {% set octavia_housekeeping_packages = [
+            'octavia-housekeeping'
+        ] %}
     {% endif %}
 
 {{ macros.install_packages(octavia_housekeeping_packages | customizable("packages")) }}

docker/octavia/octavia-worker/Dockerfile.j2

@@ -11,8 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openstack-octavia-worker'
         ] %}
     {% elif base_package_type == 'deb' %}
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-            && /bin/false
+        {% set octavia_worker_packages = [
+            'octavia-worker'
+        ] %}
     {% endif %}
 
 {{ macros.install_packages(octavia_worker_packages | customizable("packages")) }}

kolla/image/build.py

@@ -123,7 +123,6 @@
         "monasca-thresh",
         "nova-mksproxy",
         "novajoin-base",
-        "octavia-base",
         # There is no qdrouterd package for ubuntu bionic
         "qdrouterd",
         "searchlight-base",