Skip to content

Commit e04d8ad

Browse files
committed
[set_openstack_containers] Fix default ironic python agent image name
To get a match we need `RELATED_IMAGE_` prefix in the default for the ironic python agent. Signed-off-by: Sofer Athlan-Guyot <sathlang@redhat.com> Closes: [OSPCIX-1167](https://issues.redhat.com/browse/OSPCIX-1167)
1 parent 501ae13 commit e04d8ad

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

roles/set_openstack_containers/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The role will generate two 2 files in ~/ci-framework-data/artifacts/ directory a
1515
* `cifmw_set_openstack_containers_tag_from_md5`: Get the tag from delorean.repo.md5. Defaults to `false`.
1616
* `cifmw_set_openstack_containers_dlrn_md5_path`: Full path of delorean.repo.md5. Defaults to `/etc/yum.repos.d/delorean.repo.md5`.
1717
* `cifmw_set_openstack_containers_overrides`: Extra container overrides. Defaults to `{}`
18-
* `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"}`
18+
* `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"}`
1919
* `cifmw_set_openstack_containers_prefix`: Container prefix name to set. Defaults to `openstack`
2020
* `cifmw_set_openstack_containers_prefix_filter`: Include in filter containers containing prefix in the name. Defaults to value of `cifmw_set_openstack_containers_prefix`
2121
* `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`.
9999

100100
### Update an image which doesn't have openstack- in its name
101101

102-
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.
102+
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.
103103

104104
Setting `cifmw_set_openstack_containers_overrides_transform` will enable the transformation to happen.
105105

@@ -113,7 +113,7 @@ Setting `cifmw_set_openstack_containers_overrides_transform` will enable the tra
113113
cifmw_set_openstack_containers_prefix: 'openstack'
114114
cifmw_set_openstack_containers_tag: 'test-tag'
115115
cifmw_set_openstack_containers_overrides_transform:
116-
IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent"
116+
RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent"
117117
ansible.builtin.include_role:
118118
name: set_openstack_containers
119119
```

roles/set_openstack_containers/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ cifmw_set_openstack_containers_overrides: {}
3838
# Trigger non `openstack-` (as seen by
3939
# `cifmw_set_openstack_containers_prefix`) image transformation
4040
cifmw_set_openstack_containers_overrides_transform:
41-
IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent"
41+
RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT: "ironic-python-agent"

0 commit comments

Comments
 (0)