Merge "Ubuntu: container image build"

ansible/container-image-build.yml

@@ -43,14 +43,16 @@
         - kolla_docker_registry_password is not none
 
     - name: Ensure Kolla container images are built
-      shell: >
+      shell:
+        cmd: >
           set -o pipefail &&
           . {{ kolla_venv }}/bin/activate &&
-        kolla-build \
+          kolla-build
-        --config-dir {{ kolla_build_config_path }} \
+          --config-dir {{ kolla_build_config_path }}
-        {% if item.type is defined %}--type {{ item.type }}{% endif %} \
+          {% if item.type is defined %}--type {{ item.type }}{% endif %}
-        {% if kolla_docker_registry is not none %}--registry {{ kolla_docker_registry }}{% endif %} \
+          {% if kolla_docker_registry is not none %}--registry {{ kolla_docker_registry }}{% endif %}
-        {% if push_images | bool %}--push{% endif %} \
+          {% if push_images | bool %}--push{% endif %}
           {{ item.regexes }} 2>&1 | tee --append {{ kolla_build_log_path }}
+        executable: /bin/bash
       with_items: "{{ container_image_sets }}"
       when: item.regexes != ''

ansible/roles/kolla/tasks/install.yml

@@ -1,4 +1,7 @@
 ---
+- name: Include OS family-specific variables
+  include_vars: "{{ ansible_os_family }}.yml"
+
 - name: Ensure EPEL repo is installed
   package:
     name: epel-release
@@ -10,13 +13,7 @@
 
 - name: Ensure required packages are installed
   package:
-    name:
+    name: "{{ kolla_package_dependencies }}"
-      - gcc
-      - libffi-devel
-      - openssl-devel
-      - python3-devel
-      - python3-pip
-      - python3-virtualenv
     state: present
     cache_valid_time: "{{ apt_cache_valid_time if ansible_os_family == 'Debian' else omit }}"
     update_cache: "{{ True if ansible_os_family == 'Debian' else omit }}"

ansible/roles/kolla/vars/Debian.yml

@@ -0,0 +1,8 @@
+---
+# List of packages to install.
+kolla_package_dependencies:
+  - gcc
+  - libffi-dev
+  - libssl-dev
+  - python3-dev
+  - python3-pip

ansible/roles/kolla/vars/RedHat.yml

@@ -0,0 +1,8 @@
+---
+# List of packages to install.
+kolla_package_dependencies:
+  - gcc
+  - libffi-devel
+  - openssl-devel
+  - python3-devel
+  - python3-pip