Add --enable-registry-login support

Depends-On: https://review.opendev.org/#/c/720299/
Change-Id: Ia45b196af54d83bad0d23bc096d2896278942136
This commit is contained in:
Alex Schultz 2020-04-15 16:18:43 -06:00
parent 32c3d78d0c
commit 8d3de8b661
4 changed files with 15 additions and 0 deletions

View File

@ -12,6 +12,7 @@ Role Variables
--------------
* `tripleo_container_image_prepare_default_debug`: (Boolean) Flag to print out the push command. Default: False
* `tripleo_container_image_prepare_default_enable_registry_login`: (Boolean) Flag to enable registry login on nodes if credentials are provided. Default: false
* `tripleo_container_image_prepare_default_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}"
* `tripleo_container_image_prepare_default_local_push_destination`: (Boolean) Include a push_Destination to trigger upload to a local registry on the undercloud. Default: false
* `tripleo_container_image_prepare_default_output_env_file`: (String) File to write environment file containing default ContainerImagePrepare value. When not set, `tripleo_container_image_prepare_default_output` will contain yaml defining ContainerImagePrepare. Default is not set.

View File

@ -2,6 +2,7 @@
# defaults file for tripleo_container_image_prepare_default
openstack_bin: openstack
tripleo_container_image_prepare_default_debug: false
tripleo_container_image_prepare_default_enable_registry_login: false
tripleo_container_image_prepare_default_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}"
tripleo_container_image_prepare_default_home_dir: "{{ ansible_env.HOME }}"
tripleo_container_image_prepare_default_local_push_destination: false

View File

@ -40,3 +40,15 @@
that:
- tripleo_container_image_prepare_default_output ==
"tripleo container image prepare default --local-push-destination"
- name: Check parameter "tripleo_container_image_prepare_default_enable_registry_login"
include_role:
name: "tripleo_container_image_prepare_default"
vars:
tripleo_container_image_prepare_default_enable_registry_login: true
- name: Assert "tripleo_container_image_prepare_default_output_env_file"
assert:
that:
- tripleo_container_image_prepare_default_output ==
"tripleo container image prepare default --enable-registry-login"

View File

@ -7,6 +7,7 @@
{{ tripleo_container_image_prepare_default_output_env_file | ternary('--output-env-file '
~ tripleo_container_image_prepare_default_output_env_file, '') }}
{{ tripleo_container_image_prepare_default_local_push_destination | ternary('--local-push-destination', '') }}
{{ tripleo_container_image_prepare_default_enable_registry_login | ternary('--enable-registry-login', '') }}
- name: Show the container image prepare default command
debug: