openstack/kayobe
Code Issues Proposed changes

Merge "Ubuntu: container image build"

Browse Source
This commit is contained in:
Zuul 2021-03-04 18:50:40 +00:00 committed by Gerrit Code Review
commit 241f4dc921
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ansible/container-image-build.yml
View File

@ -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:
set -o pipefail && cmd: >
. {{ kolla_venv }}/bin/activate && set -o pipefail &&
kolla-build \ . {{ kolla_venv }}/bin/activate &&
--config-dir {{ kolla_build_config_path }} \ kolla-build
{% if item.type is defined %}--type {{ item.type }}{% endif %} \ --config-dir {{ kolla_build_config_path }}
{% if kolla_docker_registry is not none %}--registry {{ kolla_docker_registry }}{% endif %} \ {% if item.type is defined %}--type {{ item.type }}{% endif %}
{% if push_images | bool %}--push{% endif %} \ {% if kolla_docker_registry is not none %}--registry {{ kolla_docker_registry }}{% endif %}
{{ item.regexes }} 2>&1 | tee --append {{ kolla_build_log_path }} {% if push_images | bool %}--push{% endif %}
{{ 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 != ''

11
ansible/roles/kolla/tasks/install.yml
View File

@ -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
cache_valid_time: "{{ apt_cache_valid_time if ansible_os_family == 'Debian' else omit }}" cache_valid_time: "{{ apt_cache_valid_time if ansible_os_family == 'Debian' else omit }}"
update_cache: "{{ True if ansible_os_family == 'Debian' else omit }}" update_cache: "{{ True if ansible_os_family == 'Debian' else omit }}"

8
ansible/roles/kolla/vars/Debian.yml Normal file
View 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
View File

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