diff --git a/roles/set_openstack_containers/README.md b/roles/set_openstack_containers/README.md index 1138945a59..40384e2632 100644 --- a/roles/set_openstack_containers/README.md +++ b/roles/set_openstack_containers/README.md @@ -15,7 +15,7 @@ The role will generate two 2 files in ~/ci-framework-data/artifacts/ directory a * `cifmw_set_openstack_containers_tag_from_md5`: Get the tag from delorean.repo.md5. Defaults to `false`. * `cifmw_set_openstack_containers_dlrn_md5_path`: Full path of delorean.repo.md5. Defaults to `/etc/yum.repos.d/delorean.repo.md5`. * `cifmw_set_openstack_containers_overrides`: Extra container overrides. Defaults to `{}` -* `cifmw_set_openstack_containers_overrides_transform`: Extra container overrides but here the key is expected to be the IMAGE_URL name (like in `cifmw_set_openstack_containers_overrides`) but the value is the definite name of the image, so the registry and tag addition to that name will happen. Defaults to `{ IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent"}` +* `cifmw_set_openstack_containers_overrides_transform`: Extra container overrides but here the key is expected to be the IMAGE_URL name (like in `cifmw_set_openstack_containers_overrides`) but the value is the definite name of the image, so the registry and tag addition to that name will happen. Defaults to `{ RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent"}` * `cifmw_set_openstack_containers_prefix`: Container prefix name to set. Defaults to `openstack` * `cifmw_set_openstack_containers_prefix_filter`: Include in filter containers containing prefix in the name. Defaults to value of `cifmw_set_openstack_containers_prefix` * `cifmw_set_openstack_containers_excluded_envs`: (List[string]) List of excluded environment variables for container, that should not be modified by the role. Defaults to `[]`. @@ -99,7 +99,7 @@ It is used in edpm-ansible job to update the `ANSIBLEEE_IMAGE_URL_DEFAULT`. ### Update an image which doesn't have openstack- in its name -For instance `IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT` has this kind of url `registry-proxy.engineering.redhat.com/rh-osbs/rhoso18-ironic-python-agent:18.0` where the usual `openstack-` prefix is absent. +For instance `RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT` has this kind of url `registry-proxy.engineering.redhat.com/rh-osbs/rhoso18-ironic-python-agent:18.0` where the usual `openstack-` prefix is absent. Setting `cifmw_set_openstack_containers_overrides_transform` will enable the transformation to happen. @@ -113,7 +113,7 @@ Setting `cifmw_set_openstack_containers_overrides_transform` will enable the tra cifmw_set_openstack_containers_prefix: 'openstack' cifmw_set_openstack_containers_tag: 'test-tag' cifmw_set_openstack_containers_overrides_transform: - IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent" + RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent" ansible.builtin.include_role: name: set_openstack_containers ``` diff --git a/roles/set_openstack_containers/defaults/main.yml b/roles/set_openstack_containers/defaults/main.yml index ff6b0cc91b..c030e24273 100644 --- a/roles/set_openstack_containers/defaults/main.yml +++ b/roles/set_openstack_containers/defaults/main.yml @@ -38,4 +38,4 @@ cifmw_set_openstack_containers_overrides: {} # Trigger non `openstack-` (as seen by # `cifmw_set_openstack_containers_prefix`) image transformation cifmw_set_openstack_containers_overrides_transform: - IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent" + RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent"