Skip to content

Commit

Permalink
Update the source of containers to pull from cifmw_update_containers_…
Browse files Browse the repository at this point in the history
…registry
  • Loading branch information
frenzyfriday authored and openshift-merge-bot[bot] committed Aug 30, 2024
1 parent 5fa99bb commit 6409c2c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/dictionary/en-custom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ cacheable
cci
ccitredhat
ceilometer
ceilometersgcore
centos
ceph
cephadm
Expand Down
2 changes: 2 additions & 0 deletions roles/update_containers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ If apply, please explain the privilege escalation done in this role.
* `cifmw_update_containers_tag`: The container tag. Default to "current-podified".
* `cifmw_update_containers_cindervolumes`: The names of the cinder volumes prefix. Default to `[]`.
* `cifmw_update_containers_manilashares`: The names of the manila shares prefix. Default to `[]`.
* `cifmw_update_containers_agentimage`: Full Agent Image url for updating Agent Image.
* `cifmw_update_containers_ceilometersgcoreImage`: Full Ceilometersgcore Image url for updating Ceilometersgcore Image.
* `cifmw_update_containers_openstack`: Whether to generate CR for updating openstack containers. Default to `false`.
* `cifmw_update_containers_ansibleee_image_url`: Full Ansibleee Image url for updating Ansibleee Image.
* `cifmw_update_containers_edpm_image_url`: Full EDPM Image url for updating EDPM OS image.
Expand Down
16 changes: 16 additions & 0 deletions roles/update_containers/templates/update_containers.j2
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,22 @@ spec:
cinderBackupImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-cinder-backup:{{ cifmw_update_containers_tag }}
cinderSchedulerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-cinder-scheduler:{{ cifmw_update_containers_tag }}
cinderVolumeImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-cinder-volume:{{ cifmw_update_containers_tag }}
designateAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-designate-api:{{ cifmw_update_containers_tag }}
designateBackendbind9Image: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-designate-backend-bind9:{{ cifmw_update_containers_tag }}
designateCentralImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-designate-central:{{ cifmw_update_containers_tag }}
designateMdnsImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-designate-mdns:{{ cifmw_update_containers_tag }}
designateProducerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-designate-producer:{{ cifmw_update_containers_tag }}
designateUnboundImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-unbound:{{ cifmw_update_containers_tag }}
designateWorkerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-designate-worker:{{ cifmw_update_containers_tag }}
edpmFrrImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-frr:{{ cifmw_update_containers_tag }}
edpmIscsidImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-iscsid:{{ cifmw_update_containers_tag }}
edpmLogrotateCrondImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-cron:{{ cifmw_update_containers_tag }}
edpmMultipathdImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-multipathd:{{ cifmw_update_containers_tag }}
edpmNeutronDhcpAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-neutron-dhcp-agent:{{ cifmw_update_containers_tag }}
edpmNeutronMetadataAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-neutron-metadata-agent-ovn:{{ cifmw_update_containers_tag }}
edpmNeutronOvnAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-neutron-ovn-agent:{{ cifmw_update_containers_tag }}
edpmNeutronSriovAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-neutron-sriov-agent:{{ cifmw_update_containers_tag }}
edpmNodeExporterImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-telemetry-node:{{ cifmw_update_containers_tag }}
edpmOvnBgpAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-ovn-bgp-agent:{{ cifmw_update_containers_tag }}
glanceAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-glance-api:{{ cifmw_update_containers_tag }}
heatAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-heat-api:{{ cifmw_update_containers_tag }}
Expand Down Expand Up @@ -89,3 +99,9 @@ spec:
{% if cifmw_update_containers_ansibleee_image_url is defined %}
ansibleeeImage: {{ cifmw_update_containers_ansibleee_image_url }}
{% endif %}
{% if cifmw_update_containers_ceilometersgcoreImage is defined %}
ceilometersgcoreImage: {{ cifmw_update_containers_ceilometersgcoreImage }}
{% endif %}
{% if cifmw_update_containers_agentimage is defined %}
agentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-baremetal-operator-agent:{{ cifmw_update_containers_tag }}
{% endif %}

0 comments on commit 6409c2c

Please sign in to comment.