openstack
/
tripleo-operator-ansible
Code Issues Proposed changes

Add option to pass rhel-modules to tripleo_container_image_build 

When building RHEL-based containers, there is an option
to set the modules used. This review adds the ability
to pass the rhel-modules option from
tripleo_container_image_build.

The rhel-modules option is already added to the client:
https://opendev.org/openstack/python-tripleoclient/src/branch/master/tripleoclient/v2/tripleo_container_image.py#L212

Change-Id: Ia39b61f6fb6728fad62ee803f05d94a5f604cf6d
This commit is contained in:
Ronelle Landy 2020-09-16 11:37:51 -04:00
parent 144ca746a2
commit 2b5dd63e5f
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/tripleo_container_image_build/defaults/main.yml
View File

@ -20,6 +20,7 @@ tripleo_container_image_build_poll: 10
tripleo_container_image_build_prefix:
tripleo_container_image_build_push: false
tripleo_container_image_build_registry:
tripleo_container_image_build_rhel_modules: ''
tripleo_container_image_build_skip_build: false
tripleo_container_image_build_tag:
tripleo_container_image_build_timeout: 5700

12
roles/tripleo_container_image_build/molecule/default/converge.yml
View File

@ -165,6 +165,18 @@
- tripleo_container_image_build_output ==
"tripleo container image build --registry localhost:8787"
- name: Check parameter "tripleo_container_image_build_rhel_modules"
include_role:
name: "tripleo_container_image_build"
vars:
tripleo_container_image_build_rhel_modules: container-tools:2.0
- name: Assert "tripleo_container_image_build_rhel_modules"
assert:
that:
- tripleo_container_image_build_output ==
"tripleo container image build --rhel-modules container-tools:2.0"
- name: Check parameter "tripleo_container_image_build_skip_build"
include_role:
name: "tripleo_container_image_build"

1
roles/tripleo_container_image_build/tasks/main.yml
View File

@ -16,6 +16,7 @@
{{ tripleo_container_image_build_prefix | ternary('--prefix ' ~ tripleo_container_image_build_prefix, '') }}
{{ tripleo_container_image_build_push | ternary('--push', '') }}
{{ tripleo_container_image_build_registry | ternary('--registry ' ~ tripleo_container_image_build_registry, '') }}
{{ tripleo_container_image_build_rhel_modules | tripleo.operator.shell_arg_list('--rhel-modules') }}
{{ tripleo_container_image_build_skip_build | ternary('--skip-build', '') }}
{{ tripleo_container_image_build_tag | ternary('--tag ' ~ tripleo_container_image_build_tag, '') }}
{{ tripleo_container_image_build_volumes | tripleo.operator.shell_arg_list('--volume') }}