Skip to content

Commit 231025d

Browse files
raukadahraukadah
committed
[DNM] use kolla containers
Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
1 parent dac1ea6 commit 231025d

2 files changed

Lines changed: 151 additions & 0 deletions

File tree

‎roles/update_containers/tasks/main.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,19 @@
2121
path: "{{ cifmw_update_containers_dest_path | dirname }}"
2222

2323
- name: Generate update containers yaml file
24+
when: cifmw_update_containers_mode is not defined
2425
ansible.builtin.template:
2526
src: "update_containers.j2"
2627
dest: "{{ cifmw_update_containers_dest_path }}"
2728
mode: "0644"
2829

30+
- name: Generate update containers yaml file
31+
when: cifmw_update_containers_mode == 'kolla'
32+
ansible.builtin.template:
33+
src: "update_kolla_containers.j2"
34+
dest: "{{ cifmw_update_containers_dest_path }}"
35+
mode: "0644"
36+
2937
- name: Update the containers
3038
when: cifmw_update_containers | bool
3139
environment:

‎roles/update_containers/templates/update_kolla_containers.j2‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
apiVersion: core.openstack.org/v1beta1
2+
kind: OpenStackVersion
3+
metadata:
4+
name: {{ cifmw_update_containers_metadata }}
5+
namespace: {{ cifmw_update_containers_namespace }}
6+
spec:
7+
customContainerImages:
8+
{% if cifmw_update_containers_openstack | bool %}
9+
aodhAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/aodh-api:{{ cifmw_update_containers_tag }}
10+
aodhEvaluatorImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/aodh-evaluator:{{ cifmw_update_containers_tag }}
11+
aodhListenerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/aodh-listener:{{ cifmw_update_containers_tag }}
12+
aodhNotifierImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/aodh-notifier:{{ cifmw_update_containers_tag }}
13+
barbicanAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/barbican-api:{{ cifmw_update_containers_barbican_custom_tag | default(cifmw_update_containers_tag) }}
14+
barbicanKeystoneListenerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/barbican-keystone-listener:{{ cifmw_update_containers_tag }}
15+
barbicanWorkerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/barbican-worker:{{ cifmw_update_containers_barbican_custom_tag | default(cifmw_update_containers_tag) }}
16+
ceilometerCentralImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ceilometer-central:{{ cifmw_update_containers_tag }}
17+
ceilometerComputeImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ceilometer-compute:{{ cifmw_update_containers_tag }}
18+
ceilometerIpmiImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ceilometer-ipmi:{{ cifmw_update_containers_tag }}
19+
ceilometerNotificationImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ceilometer-notification:{{ cifmw_update_containers_tag }}
20+
cinderAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/cinder-api:{{ cifmw_update_containers_tag }}
21+
cinderBackupImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/cinder-backup:{{ cifmw_update_containers_tag }}
22+
cinderSchedulerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/cinder-scheduler:{{ cifmw_update_containers_tag }}
23+
cinderVolumeImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/cinder-volume:{{ cifmw_update_containers_tag }}
24+
cloudkittyAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/cloudkitty-api:{{ cifmw_update_containers_tag }}
25+
cloudkittyProcImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/cloudkitty-processor:{{ cifmw_update_containers_tag }}
26+
designateAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/designate-api:{{ cifmw_update_containers_tag }}
27+
designateBackendbind9Image: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/designate-backend-bind9:{{ cifmw_update_containers_tag }}
28+
designateCentralImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/designate-central:{{ cifmw_update_containers_tag }}
29+
designateMdnsImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/designate-mdns:{{ cifmw_update_containers_tag }}
30+
designateProducerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/designate-producer:{{ cifmw_update_containers_tag }}
31+
# Hardcoded: unbound is an EDPM/RDO-specific image, never built by the Kolla project.
32+
designateUnboundImage: quay.rdoproject.org/podified-master-centos10/openstack-unbound:current
33+
designateWorkerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/designate-worker:{{ cifmw_update_containers_tag }}
34+
# Hardcoded: frr is an EDPM/RDO-specific image, never built by the Kolla project.
35+
edpmFrrImage: quay.rdoproject.org/podified-master-centos10/openstack-frr:current
36+
edpmIscsidImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/iscsid:{{ cifmw_update_containers_tag }}
37+
edpmLogrotateCrondImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/cron:{{ cifmw_update_containers_tag }}
38+
edpmMultipathdImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/multipathd:{{ cifmw_update_containers_tag }}
39+
edpmNeutronDhcpAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/neutron-dhcp-agent:{{ cifmw_update_containers_tag }}
40+
# Kolla uses neutron-metadata-agent (no -ovn suffix).
41+
edpmNeutronMetadataAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/neutron-metadata-agent:{{ cifmw_update_containers_tag }}
42+
edpmNeutronOvnAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/neutron-ovn-agent:{{ cifmw_update_containers_tag }}
43+
edpmNeutronSriovAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/neutron-sriov-agent:{{ cifmw_update_containers_tag }}
44+
# Hardcoded: ovn-bgp-agent is an EDPM/RDO-specific image, never built by the Kolla project.
45+
# Note: Kolla's neutron-bgp-dragent is a different service (Neutron BGP dynamic routing agent).
46+
edpmOvnBgpAgentImage: quay.rdoproject.org/podified-master-centos10/openstack-ovn-bgp-agent:current
47+
glanceAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/glance-api:{{ cifmw_update_containers_tag }}
48+
heatAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/heat-api:{{ cifmw_update_containers_tag }}
49+
heatCfnapiImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/heat-api-cfn:{{ cifmw_update_containers_tag }}
50+
heatEngineImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/heat-engine:{{ cifmw_update_containers_tag }}
51+
horizonImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/horizon:{{ cifmw_update_containers_tag }}
52+
infraDnsmasqImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/neutron-server:{{ cifmw_update_containers_tag }}
53+
infraMemcachedImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/memcached:{{ cifmw_update_containers_tag }}
54+
ironicAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ironic-api:{{ cifmw_update_containers_tag }}
55+
ironicConductorImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ironic-conductor:{{ cifmw_update_containers_tag }}
56+
# Hardcoded: ironic-inspector was removed from Kolla master.
57+
# It was present in stable/2025.1 (last Kolla tag: 2025.1-rocky-10) but
58+
# docker/ironic/ironic-inspector no longer exists on the master branch.
59+
ironicInspectorImage: quay.rdoproject.org/podified-master-centos10/openstack-ironic-inspector:current
60+
ironicNeutronAgentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ironic-neutron-agent:{{ cifmw_update_containers_tag }}
61+
ironicPxeImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ironic-pxe:{{ cifmw_update_containers_tag }}
62+
keystoneAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/keystone:{{ cifmw_update_containers_tag }}
63+
manilaAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/manila-api:{{ cifmw_update_containers_tag }}
64+
manilaSchedulerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/manila-scheduler:{{ cifmw_update_containers_tag }}
65+
manilaShareImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/manila-share:{{ cifmw_update_containers_tag }}
66+
# Hardcoded: Kolla's mariadb-server is not compatible with the mariadb-operator.
67+
# The Galera operator expects RDO-specific entrypoints for gcomm:// URI bootstrap.
68+
mariadbImage: quay.rdoproject.org/podified-master-centos10/openstack-mariadb:current
69+
neutronAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/neutron-server:{{ cifmw_update_containers_tag }}
70+
novaAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/nova-api:{{ cifmw_update_containers_tag }}
71+
novaComputeImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/nova-compute:{{ cifmw_update_containers_tag }}
72+
novaConductorImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/nova-conductor:{{ cifmw_update_containers_tag }}
73+
novaNovncImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/nova-novncproxy:{{ cifmw_update_containers_tag }}
74+
novaSchedulerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/nova-scheduler:{{ cifmw_update_containers_tag }}
75+
octaviaAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/octavia-api:{{ cifmw_update_containers_tag }}
76+
octaviaHealthmanagerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/octavia-health-manager:{{ cifmw_update_containers_tag }}
77+
octaviaHousekeepingImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/octavia-housekeeping:{{ cifmw_update_containers_tag }}
78+
octaviaWorkerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/octavia-worker:{{ cifmw_update_containers_tag }}
79+
# Kolla uses openstack-base (openstackclient is not available in Kolla).
80+
openstackClientImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/openstack-base:{{ cifmw_update_containers_tag }}
81+
ovnControllerImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ovn-controller:{{ cifmw_update_containers_tag }}
82+
ovnControllerOvsImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ovn-base:{{ cifmw_update_containers_tag }}
83+
ovnNbDbclusterImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ovn-nb-db-server:{{ cifmw_update_containers_tag }}
84+
ovnNorthdImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ovn-northd:{{ cifmw_update_containers_tag }}
85+
ovnSbDbclusterImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/ovn-sb-db-server:{{ cifmw_update_containers_tag }}
86+
placementAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/placement-api:{{ cifmw_update_containers_tag }}
87+
rabbitmqImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/rabbitmq:{{ cifmw_update_containers_tag }}
88+
# Hardcoded: Swift was removed from the Kolla project.
89+
# No docker/swift directory exists in Kolla master or stable/2025.1.
90+
# Last available Kolla tags for Swift images are 2024.2-rocky-9.
91+
swiftAccountImage: quay.rdoproject.org/podified-master-centos10/openstack-swift-account:current
92+
swiftContainerImage: quay.rdoproject.org/podified-master-centos10/openstack-swift-container:current
93+
swiftObjectImage: quay.rdoproject.org/podified-master-centos10/openstack-swift-object:current
94+
swiftProxyImage: quay.rdoproject.org/podified-master-centos10/openstack-swift-proxy-server:current
95+
# Hardcoded: tempest was never built by the Kolla project.
96+
# No docker/tempest directory exists in Kolla master or stable/2025.1.
97+
testTempestImage: quay.rdoproject.org/podified-master-centos10/openstack-tempest-all:current
98+
{% if (cifmw_update_containers_cindervolumes | length > 0 or
99+
(cifmw_update_containers_cindervolumes_extra is defined and cifmw_update_containers_cindervolumes_extra is mapping)) %}
100+
cinderVolumeImages:
101+
{% endif %}
102+
{% if cifmw_update_containers_cindervolumes | length > 0 %}
103+
{% for vol in cifmw_update_containers_cindervolumes %}
104+
{{ vol }}: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/cinder-volume:{{ cifmw_update_containers_tag }}
105+
{% endfor %}
106+
{% endif %}
107+
{% if (cifmw_update_containers_cindervolumes_extra is defined and
108+
cifmw_update_containers_cindervolumes_extra is mapping) %}
109+
{% for container_name, container_uri in cifmw_update_containers_cindervolumes_extra.items() %}
110+
{{ container_name }}: {{ container_uri }}
111+
{% endfor %}
112+
{% endif %}
113+
{% if cifmw_update_containers_manilashares | length > 0 %}
114+
manilaShareImages:
115+
{% for shares in cifmw_update_containers_manilashares %}
116+
{{ shares }}: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/manila-share:{{ cifmw_update_containers_tag }}
117+
{% endfor %}
118+
{% endif %}
119+
{% endif %}
120+
{% if cifmw_update_containers_edpm_image_url is defined %}
121+
osContainerImage: {{ cifmw_update_containers_edpm_image_url }}
122+
{% endif %}
123+
{% if cifmw_update_containers_ipa_image_url is defined %}
124+
ironicPythonAgentImage: {{ cifmw_update_containers_ipa_image_url }}
125+
{% endif %}
126+
{% if cifmw_update_containers_ansibleee_image_url is defined %}
127+
ansibleeeImage: {{ cifmw_update_containers_ansibleee_image_url }}
128+
{% endif %}
129+
{% if cifmw_update_containers_ceilometersgcoreImage is defined %}
130+
ceilometerSgcoreImage: {{ cifmw_update_containers_ceilometersgcoreImage }}
131+
{% endif %}
132+
{% if cifmw_update_containers_edpmnodeexporterimage is defined %}
133+
edpmNodeExporterImage: {{ cifmw_update_containers_edpmnodeexporterimage }}
134+
{% endif %}
135+
{% if cifmw_update_containers_agentimage is defined %}
136+
agentImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/baremetal-operator-agent:{{ cifmw_update_containers_tag }}
137+
{% endif %}
138+
{% if cifmw_update_containers_watcher | bool %}
139+
watcherAPIImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/watcher-api:{{ cifmw_update_containers_tag }}
140+
watcherApplierImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/watcher-applier:{{ cifmw_update_containers_tag }}
141+
# Kolla uses watcher-engine (not watcher-decision-engine).
142+
watcherDecisionEngineImage: {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/watcher-engine:{{ cifmw_update_containers_tag }}
143+
{% endif %}

0 commit comments

Comments
 (0)