Ubuntu: container image build
* Use bash to execute kolla-build * Remove backslashes from kolla-build command. YAML folded literal block avoids the need for this by replacing newlines with spaces * Distribution-specific package list when installing kolla Change-Id: Icad129aaafb17023f3c9d007fb63466b23b1395a Story: 2004960 Task: 41764
This commit is contained in:
parent
9f41cefc15
commit
e2a01b790f
@ -43,14 +43,16 @@
|
|||||||
- kolla_docker_registry_password is not none
|
- kolla_docker_registry_password is not none
|
||||||
|
|
||||||
- name: Ensure Kolla container images are built
|
- name: Ensure Kolla container images are built
|
||||||
shell: >
|
shell:
|
||||||
|
cmd: >
|
||||||
set -o pipefail &&
|
set -o pipefail &&
|
||||||
. {{ kolla_venv }}/bin/activate &&
|
. {{ 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 }}
|
{{ item.regexes }} 2>&1 | tee --append {{ kolla_build_log_path }}
|
||||||
|
executable: /bin/bash
|
||||||
with_items: "{{ container_image_sets }}"
|
with_items: "{{ container_image_sets }}"
|
||||||
when: item.regexes != ''
|
when: item.regexes != ''
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
---
|
---
|
||||||
|
- name: Include OS family-specific variables
|
||||||
|
include_vars: "{{ ansible_os_family }}.yml"
|
||||||
|
|
||||||
- name: Ensure EPEL repo is installed
|
- name: Ensure EPEL repo is installed
|
||||||
package:
|
package:
|
||||||
name: epel-release
|
name: epel-release
|
||||||
@ -10,13 +13,7 @@
|
|||||||
|
|
||||||
- name: Ensure required packages are installed
|
- name: Ensure required packages are installed
|
||||||
package:
|
package:
|
||||||
name:
|
name: "{{ kolla_package_dependencies }}"
|
||||||
- gcc
|
|
||||||
- libffi-devel
|
|
||||||
- openssl-devel
|
|
||||||
- python3-devel
|
|
||||||
- python3-pip
|
|
||||||
- python3-virtualenv
|
|
||||||
state: present
|
state: present
|
||||||
become: True
|
become: True
|
||||||
|
|
||||||
|
8
ansible/roles/kolla/vars/Debian.yml
Normal file
8
ansible/roles/kolla/vars/Debian.yml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
# List of packages to install.
|
||||||
|
kolla_package_dependencies:
|
||||||
|
- gcc
|
||||||
|
- libffi-dev
|
||||||
|
- libssl-dev
|
||||||
|
- python3-dev
|
||||||
|
- python3-pip
|
8
ansible/roles/kolla/vars/RedHat.yml
Normal file
8
ansible/roles/kolla/vars/RedHat.yml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
# List of packages to install.
|
||||||
|
kolla_package_dependencies:
|
||||||
|
- gcc
|
||||||
|
- libffi-devel
|
||||||
|
- openssl-devel
|
||||||
|
- python3-devel
|
||||||
|
- python3-pip
|
Loading…
x
Reference in New Issue
Block a user