Merge "build: enable Octavia for Ubuntu/binary"

6 files changed, 17 insertions, 11 deletions

diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2
index a9967524b..78f696450 100644
--- a/docker/octavia/octavia-api/Dockerfile.j2
+++ b/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 %}
 
 
diff --git a/docker/octavia/octavia-base/Dockerfile.j2 b/docker/octavia/octavia-base/Dockerfile.j2
index 0efcc6db7..526965f51 100644
--- a/docker/octavia/octavia-base/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/octavia/octavia-health-manager/Dockerfile.j2 b/docker/octavia/octavia-health-manager/Dockerfile.j2
index 4dfcbe189..6983f793c 100644
--- a/docker/octavia/octavia-health-manager/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/octavia/octavia-housekeeping/Dockerfile.j2 b/docker/octavia/octavia-housekeeping/Dockerfile.j2
index c7a25cf7a..31688d6fe 100644
--- a/docker/octavia/octavia-housekeeping/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/octavia/octavia-worker/Dockerfile.j2 b/docker/octavia/octavia-worker/Dockerfile.j2
index 296852495..40db1bc80 100644
--- a/docker/octavia/octavia-worker/Dockerfile.j2
+++ b/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")) }}
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 0ad5cd6d3..38a62d479 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -178,7 +178,6 @@ UNBUILDABLE_IMAGES = {
         "ironic-neutron-agent",
         "mistral-event-engine",
         "novajoin-base",
-        "octavia-base",
         "tacker-base",
         "tripleoclient",
         "vitrage-base",