Browse Source

Add image_source to containers

Previously when containers were added to the upstream kolla project or
added to our container list, the container build process might try and
build them when we execute kolla-build.  This change adds a image_source
parameter that is used to understand when we should and should not
attempt to build the container with kolla witht he 'overcloud container
image build' command.

Change-Id: I82d6e09c856f78c0b29d7324c59b5e00bf5ae04d
Closes-BUg: #1801969
tags/10.2.0
Alex Schultz 9 months ago
parent
commit
8abbdeb423

+ 133
- 0
container-images/overcloud_containers.yaml View File

@@ -1,134 +1,267 @@
1 1
 container_images:
2 2
 - imagename: docker.io/tripleomaster/centos-binary-aodh-api:current-tripleo
3
+  image_source: kolla
3 4
 - imagename: docker.io/tripleomaster/centos-binary-aodh-evaluator:current-tripleo
5
+  image_source: kolla
4 6
 - imagename: docker.io/tripleomaster/centos-binary-aodh-listener:current-tripleo
7
+  image_source: kolla
5 8
 - imagename: docker.io/tripleomaster/centos-binary-aodh-notifier:current-tripleo
9
+  image_source: kolla
6 10
 - imagename: docker.io/tripleomaster/centos-binary-barbican-api:current-tripleo
11
+  image_source: kolla
7 12
 - imagename: docker.io/tripleomaster/centos-binary-barbican-keystone-listener:current-tripleo
13
+  image_source: kolla
8 14
 - imagename: docker.io/tripleomaster/centos-binary-barbican-worker:current-tripleo
15
+  image_source: kolla
9 16
 - imagename: docker.io/tripleomaster/centos-binary-ceilometer-central:current-tripleo
17
+  image_source: kolla
10 18
 - imagename: docker.io/tripleomaster/centos-binary-ceilometer-compute:current-tripleo
19
+  image_source: kolla
11 20
 - imagename: docker.io/tripleomaster/centos-binary-ceilometer-notification:current-tripleo
21
+  image_source: kolla
12 22
 - imagename: docker.io/tripleomaster/centos-binary-ceilometer-ipmi:current-tripleo
23
+  image_source: kolla
13 24
 - imagename: docker.io/tripleomaster/centos-binary-cinder-api:current-tripleo
25
+  image_source: kolla
14 26
 - imagename: docker.io/tripleomaster/centos-binary-cinder-backup:current-tripleo
27
+  image_source: kolla
15 28
 - imagename: docker.io/tripleomaster/centos-binary-cinder-scheduler:current-tripleo
29
+  image_source: kolla
16 30
 - imagename: docker.io/tripleomaster/centos-binary-cinder-volume:current-tripleo
31
+  image_source: kolla
17 32
 - imagename: docker.io/tripleomaster/centos-binary-collectd:current-tripleo
33
+  image_source: kolla
18 34
 - imagename: docker.io/tripleomaster/centos-binary-congress-api:current-tripleo
35
+  image_source: kolla
19 36
 - imagename: docker.io/tripleomaster/centos-binary-cron:current-tripleo
37
+  image_source: kolla
20 38
 - imagename: docker.io/tripleomaster/centos-binary-designate-api:current-tripleo
39
+  image_source: kolla
21 40
 - imagename: docker.io/tripleomaster/centos-binary-designate-backend-bind9:current-tripleo
41
+  image_source: kolla
22 42
 - imagename: docker.io/tripleomaster/centos-binary-designate-base:current-tripleo
43
+  image_source: kolla
23 44
 - imagename: docker.io/tripleomaster/centos-binary-designate-central:current-tripleo
45
+  image_source: kolla
24 46
 - imagename: docker.io/tripleomaster/centos-binary-designate-mdns:current-tripleo
47
+  image_source: kolla
25 48
 - imagename: docker.io/tripleomaster/centos-binary-designate-producer:current-tripleo
49
+  image_source: kolla
26 50
 - imagename: docker.io/tripleomaster/centos-binary-designate-sink:current-tripleo
51
+  image_source: kolla
27 52
 - imagename: docker.io/tripleomaster/centos-binary-designate-worker:current-tripleo
53
+  image_source: kolla
28 54
 - imagename: docker.io/tripleomaster/centos-binary-ec2-api:current-tripleo
55
+  image_source: kolla
29 56
 - imagename: docker.io/tripleomaster/centos-binary-etcd:current-tripleo
57
+  image_source: kolla
30 58
 - imagename: docker.io/tripleomaster/centos-binary-fluentd:current-tripleo
59
+  image_source: kolla
31 60
 - imagename: docker.io/tripleomaster/centos-binary-glance-api:current-tripleo
61
+  image_source: kolla
32 62
 - imagename: docker.io/tripleomaster/centos-binary-gnocchi-api:current-tripleo
63
+  image_source: kolla
33 64
 - imagename: docker.io/tripleomaster/centos-binary-gnocchi-metricd:current-tripleo
65
+  image_source: kolla
34 66
 - imagename: docker.io/tripleomaster/centos-binary-gnocchi-statsd:current-tripleo
67
+  image_source: kolla
35 68
 - imagename: docker.io/tripleomaster/centos-binary-haproxy:current-tripleo
69
+  image_source: kolla
36 70
 - imagename: docker.io/tripleomaster/centos-binary-heat-all:current-tripleo
71
+  image_source: kolla
37 72
 - imagename: docker.io/tripleomaster/centos-binary-heat-api-cfn:current-tripleo
73
+  image_source: kolla
38 74
 - imagename: docker.io/tripleomaster/centos-binary-heat-api:current-tripleo
75
+  image_source: kolla
39 76
 - imagename: docker.io/tripleomaster/centos-binary-heat-engine:current-tripleo
77
+  image_source: kolla
40 78
 - imagename: docker.io/tripleomaster/centos-binary-horizon:current-tripleo
79
+  image_source: kolla
41 80
 - imagename: docker.io/tripleomaster/centos-binary-ironic-api:current-tripleo
81
+  image_source: kolla
42 82
 - imagename: docker.io/tripleomaster/centos-binary-ironic-conductor:current-tripleo
83
+  image_source: kolla
43 84
 - imagename: docker.io/tripleomaster/centos-binary-ironic-inspector:current-tripleo
85
+  image_source: kolla
44 86
 - imagename: docker.io/tripleomaster/centos-binary-ironic-pxe:current-tripleo
87
+  image_source: kolla
45 88
 - imagename: docker.io/tripleomaster/centos-binary-ironic-neutron-agent:current-tripleo
89
+  image_source: kolla
46 90
 - imagename: docker.io/tripleomaster/centos-binary-iscsid:current-tripleo
91
+  image_source: kolla
47 92
 - imagename: docker.io/tripleomaster/centos-binary-keepalived:current-tripleo
93
+  image_source: kolla
48 94
 - imagename: docker.io/tripleomaster/centos-binary-keystone:current-tripleo
95
+  image_source: kolla
49 96
 - imagename: docker.io/tripleomaster/centos-binary-manila-api:current-tripleo
97
+  image_source: kolla
50 98
 - imagename: docker.io/tripleomaster/centos-binary-manila-base:current-tripleo
99
+  image_source: kolla
51 100
 - imagename: docker.io/tripleomaster/centos-binary-manila-scheduler:current-tripleo
101
+  image_source: kolla
52 102
 - imagename: docker.io/tripleomaster/centos-binary-manila-share:current-tripleo
103
+  image_source: kolla
53 104
 - imagename: docker.io/tripleomaster/centos-binary-mariadb:current-tripleo
105
+  image_source: kolla
54 106
 - imagename: docker.io/tripleomaster/centos-binary-memcached:current-tripleo
107
+  image_source: kolla
55 108
 - imagename: docker.io/tripleomaster/centos-binary-mistral-api:current-tripleo
109
+  image_source: kolla
56 110
 - imagename: docker.io/tripleomaster/centos-binary-mistral-engine:current-tripleo
111
+  image_source: kolla
57 112
 - imagename: docker.io/tripleomaster/centos-binary-mistral-executor:current-tripleo
113
+  image_source: kolla
58 114
 - imagename: docker.io/tripleomaster/centos-binary-mistral-event-engine:current-tripleo
115
+  image_source: kolla
59 116
 - imagename: docker.io/tripleomaster/centos-binary-multipathd:current-tripleo
117
+  image_source: kolla
60 118
 - imagename: docker.io/tripleomaster/centos-binary-neutron-dhcp-agent:current-tripleo
119
+  image_source: kolla
61 120
 - imagename: docker.io/tripleomaster/centos-binary-neutron-l3-agent:current-tripleo
121
+  image_source: kolla
62 122
 - imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent:current-tripleo
123
+  image_source: kolla
63 124
 - imagename: docker.io/tripleomaster/centos-binary-neutron-openvswitch-agent:current-tripleo
125
+  image_source: kolla
64 126
 - imagename: docker.io/tripleomaster/centos-binary-neutron-sriov-agent:current-tripleo
127
+  image_source: kolla
65 128
 - imagename: docker.io/tripleomaster/centos-binary-neutron-server:current-tripleo
129
+  image_source: kolla
66 130
 - imagename: docker.io/tripleomaster/centos-binary-neutron-server-opendaylight:current-tripleo
131
+  image_source: kolla
67 132
 - imagename: docker.io/tripleomaster/centos-binary-neutron-server-ovn:current-tripleo
133
+  image_source: kolla
68 134
 - imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent-ovn:current-tripleo
135
+  image_source: kolla
69 136
 - imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo
137
+  image_source: kolla
70 138
 - imagename: docker.io/tripleomaster/centos-binary-nova-compute-ironic:current-tripleo
139
+  image_source: kolla
71 140
 - imagename: docker.io/tripleomaster/centos-binary-nova-compute:current-tripleo
141
+  image_source: kolla
72 142
 - imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo
143
+  image_source: kolla
73 144
 - imagename: docker.io/tripleomaster/centos-binary-nova-consoleauth:current-tripleo
145
+  image_source: kolla
74 146
 - imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo
147
+  image_source: kolla
75 148
 - imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo
149
+  image_source: kolla
76 150
 - imagename: docker.io/tripleomaster/centos-binary-nova-placement-api:current-tripleo
151
+  image_source: kolla
77 152
 - imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo
153
+  image_source: kolla
78 154
 - imagename: docker.io/tripleomaster/centos-binary-novajoin-notifier:current-tripleo
155
+  image_source: kolla
79 156
 - imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo
157
+  image_source: kolla
80 158
 - imagename: docker.io/tripleomaster/centos-binary-octavia-base:current-tripleo
159
+  image_source: kolla
81 160
 - imagename: docker.io/tripleomaster/centos-binary-octavia-api:current-tripleo
161
+  image_source: kolla
82 162
 - imagename: docker.io/tripleomaster/centos-binary-octavia-health-manager:current-tripleo
163
+  image_source: kolla
83 164
 - imagename: docker.io/tripleomaster/centos-binary-octavia-housekeeping:current-tripleo
165
+  image_source: kolla
84 166
 - imagename: docker.io/tripleomaster/centos-binary-octavia-worker:current-tripleo
167
+  image_source: kolla
85 168
 - imagename: docker.io/tripleomaster/centos-binary-opendaylight:current-tripleo
169
+  image_source: kolla
86 170
 - imagename: docker.io/tripleomaster/centos-binary-ovn-base:current-tripleo
171
+  image_source: kolla
87 172
 - imagename: docker.io/tripleomaster/centos-binary-ovn-controller:current-tripleo
173
+  image_source: kolla
88 174
 - imagename: docker.io/tripleomaster/centos-binary-ovn-nb-db-server:current-tripleo
175
+  image_source: kolla
89 176
 - imagename: docker.io/tripleomaster/centos-binary-ovn-northd:current-tripleo
177
+  image_source: kolla
90 178
 - imagename: docker.io/tripleomaster/centos-binary-ovn-sb-db-server:current-tripleo
179
+  image_source: kolla
91 180
 - imagename: docker.io/tripleomaster/centos-binary-panko-api:current-tripleo
181
+  image_source: kolla
92 182
 - imagename: docker.io/tripleomaster/centos-binary-qdrouterd:current-tripleo
183
+  image_source: kolla
93 184
 - imagename: docker.io/tripleomaster/centos-binary-rabbitmq:current-tripleo
185
+  image_source: kolla
94 186
 - imagename: docker.io/tripleomaster/centos-binary-redis:current-tripleo
187
+  image_source: kolla
95 188
 - imagename: docker.io/tripleomaster/centos-binary-sahara-api:current-tripleo
189
+  image_source: kolla
96 190
 - imagename: docker.io/tripleomaster/centos-binary-sahara-engine:current-tripleo
191
+  image_source: kolla
97 192
 - imagename: docker.io/tripleomaster/centos-binary-sensu-client:current-tripleo
193
+  image_source: kolla
98 194
 - imagename: docker.io/tripleomaster/centos-binary-skydive-agent:current-tripleo
195
+  image_source: kolla
99 196
 - imagename: docker.io/tripleomaster/centos-binary-skydive-analyzer:current-tripleo
197
+  image_source: kolla
100 198
 - imagename: docker.io/tripleomaster/centos-binary-swift-account:current-tripleo
199
+  image_source: kolla
101 200
 - imagename: docker.io/tripleomaster/centos-binary-swift-container:current-tripleo
201
+  image_source: kolla
102 202
 - imagename: docker.io/tripleomaster/centos-binary-swift-object:current-tripleo
203
+  image_source: kolla
103 204
 - imagename: docker.io/tripleomaster/centos-binary-swift-proxy-server:current-tripleo
205
+  image_source: kolla
104 206
 - imagename: docker.io/tripleomaster/centos-binary-tripleo-ui:current-tripleo
207
+  image_source: kolla
105 208
 - imagename: docker.io/tripleomaster/centos-binary-zaqar:current-tripleo
209
+  image_source: kolla
106 210
 - imagename: docker.io/ceph/daemon:v3.1.0-stable-3.1-luminous-centos-7-x86_64
211
+  image_source: ceph
107 212
 - imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
213
+  image_source: kolla
108 214
 - imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo
215
+  image_source: kolla
109 216
 - imagename: docker.io/openshift/origin-ansible:v3.11.0
217
+  image_source: openshift
110 218
 - imagename: docker.io/openshift/origin-console:v3.11.0
219
+  image_source: openshift
111 220
 - imagename: docker.io/openshift/origin-control-plane:v3.11.0
221
+  image_source: openshift
112 222
 - imagename: docker.io/openshift/origin-deployer:v3.11.0
223
+  image_source: openshift
113 224
 - imagename: docker.io/openshift/origin-docker-builder:v3.11.0
225
+  image_source: openshift
114 226
 - imagename: docker.io/openshift/origin-docker-registry:v3.11.0
227
+  image_source: openshift
115 228
 - imagename: docker.io/openshift/origin-haproxy-router:v3.11.0
229
+  image_source: openshift
116 230
 - imagename: docker.io/openshift/origin-node:v3.11.0
231
+  image_source: openshift
117 232
 - imagename: docker.io/openshift/origin-pod:v3.11.0
233
+  image_source: openshift
118 234
 - imagename: docker.io/openshift/origin-web-console:v3.11.0
235
+  image_source: openshift
119 236
 - imagename: docker.io/cockpit/kubernetes:latest
237
+  image_source: openshift
120 238
 - imagename: registry.fedoraproject.org/latest/etcd:latest
239
+  image_source: openshift
121 240
 - imagename: docker.io/gluster/gluster-centos:latest
241
+  image_source: openshift
122 242
 - imagename: docker.io/gluster/glusterblock-provisioner:latest
243
+  image_source: openshift
123 244
 - imagename: docker.io/heketi/heketi:latest
245
+  image_source: openshift
124 246
 - imagename: quay.io/coreos/cluster-monitoring-operator:v0.1.1
247
+  image_source: openshift
125 248
 - imagename: quay.io/coreos/configmap-reload:latest
249
+  image_source: openshift
126 250
 - imagename: quay.io/coreos/prometheus-operator:latest
251
+  image_source: openshift
127 252
 - imagename: quay.io/coreos/prometheus-config-reloader:v0.24.0
253
+  image_source: openshift
128 254
 - imagename: docker.io/openshift/prometheus:latest
255
+  image_source: openshift
129 256
 - imagename: docker.io/openshift/prometheus-alertmanager:latest
257
+  image_source: openshift
130 258
 - imagename: docker.io/openshift/prometheus-node-exporter:latest
259
+  image_source: openshift
131 260
 - imagename: docker.io/openshift/oauth-proxy:latest
261
+  image_source: openshift
132 262
 - imagename: quay.io/coreos/kube-rbac-proxy:v0.3.1
263
+  image_source: openshift
133 264
 - imagename: quay.io/coreos/kube-state-metrics:latest
265
+  image_source: openshift
134 266
 - imagename: docker.io/grafana/grafana:latest
267
+  image_source: openshift

+ 133
- 0
container-images/overcloud_containers.yaml.j2 View File

@@ -1,6 +1,7 @@
1 1
 container_images_template:
2 2
 
3 3
 - imagename: "{{namespace}}/{{name_prefix}}aodh-api{{name_suffix}}:{{tag}}"
4
+  image_source: kolla
4 5
   params:
5 6
   - DockerAodhApiImage
6 7
   - DockerAodhConfigImage
@@ -15,6 +16,7 @@ container_images_template:
15 16
   - OS::TripleO::Services::UndercloudAodhNotifier
16 17
 
17 18
 - imagename: "{{namespace}}/{{name_prefix}}aodh-evaluator{{name_suffix}}:{{tag}}"
19
+  image_source: kolla
18 20
   params:
19 21
   - DockerAodhEvaluatorImage
20 22
   services:
@@ -22,6 +24,7 @@ container_images_template:
22 24
   - OS::TripleO::Services::UndercloudAodhEvaluator
23 25
 
24 26
 - imagename: "{{namespace}}/{{name_prefix}}aodh-listener{{name_suffix}}:{{tag}}"
27
+  image_source: kolla
25 28
   params:
26 29
   - DockerAodhListenerImage
27 30
   services:
@@ -29,6 +32,7 @@ container_images_template:
29 32
   - OS::TripleO::Services::UndercloudAodhListener
30 33
 
31 34
 - imagename: "{{namespace}}/{{name_prefix}}aodh-notifier{{name_suffix}}:{{tag}}"
35
+  image_source: kolla
32 36
   params:
33 37
   - DockerAodhNotifierImage
34 38
   services:
@@ -36,6 +40,7 @@ container_images_template:
36 40
   - OS::TripleO::Services::UndercloudAodhNotifier
37 41
 
38 42
 - imagename: "{{namespace}}/{{name_prefix}}barbican-api{{name_suffix}}:{{tag}}"
43
+  image_source: kolla
39 44
   params:
40 45
   - DockerBarbicanApiImage
41 46
   - DockerBarbicanConfigImage
@@ -43,6 +48,7 @@ container_images_template:
43 48
   - OS::TripleO::Services::BarbicanApi
44 49
 
45 50
 - imagename: "{{namespace}}/{{name_prefix}}barbican-keystone-listener{{name_suffix}}:{{tag}}"
51
+  image_source: kolla
46 52
   params:
47 53
   - DockerBarbicanKeystoneListenerImage
48 54
   - DockerBarbicanKeystoneListenerConfigImage
@@ -51,6 +57,7 @@ container_images_template:
51 57
   - OS::TripleO::Services::BarbicanKeystoneListener
52 58
 
53 59
 - imagename: "{{namespace}}/{{name_prefix}}barbican-worker{{name_suffix}}:{{tag}}"
60
+  image_source: kolla
54 61
   params:
55 62
   - DockerBarbicanWorkerImage
56 63
   - DockerBarbicanWorkerConfigImage
@@ -59,6 +66,7 @@ container_images_template:
59 66
   - OS::TripleO::Services::BarbicanWorker
60 67
 
61 68
 - imagename: "{{namespace}}/{{name_prefix}}ceilometer-central{{name_suffix}}:{{tag}}"
69
+  image_source: kolla
62 70
   params:
63 71
   - DockerCeilometerCentralImage
64 72
   - DockerCeilometerConfigImage
@@ -72,12 +80,14 @@ container_images_template:
72 80
   - OS::TripleO::Services::UndercloudCeilometerAgentNotification
73 81
 
74 82
 - imagename: "{{namespace}}/{{name_prefix}}ceilometer-compute{{name_suffix}}:{{tag}}"
83
+  image_source: kolla
75 84
   params:
76 85
   - DockerCeilometerComputeImage
77 86
   services:
78 87
   - OS::TripleO::Services::ComputeCeilometerAgent
79 88
 
80 89
 - imagename: "{{namespace}}/{{name_prefix}}ceilometer-notification{{name_suffix}}:{{tag}}"
90
+  image_source: kolla
81 91
   params:
82 92
   - DockerCeilometerNotificationImage
83 93
   services:
@@ -85,6 +95,7 @@ container_images_template:
85 95
   - OS::TripleO::Services::UndercloudCeilometerAgentNotification
86 96
 
87 97
 - imagename: "{{namespace}}/{{name_prefix}}ceilometer-ipmi{{name_suffix}}:{{tag}}"
98
+  image_source: kolla
88 99
   params:
89 100
   - DockerCeilometerIpmiImage
90 101
   services:
@@ -92,6 +103,7 @@ container_images_template:
92 103
   - OS::TripleO::Services::UndercloudCeilometerAgentIpmi
93 104
 
94 105
 - imagename: "{{namespace}}/{{name_prefix}}cinder-api{{name_suffix}}:{{tag}}"
106
+  image_source: kolla
95 107
   params:
96 108
   - DockerCinderApiImage
97 109
   - DockerCinderConfigImage
@@ -106,12 +118,14 @@ container_images_template:
106 118
   - OS::TripleO::Services::UndercloudCinderVolume
107 119
 
108 120
 - imagename: "{{namespace}}/{{name_prefix}}cinder-backup{{name_suffix}}:{{tag}}"
121
+  image_source: kolla
109 122
   params:
110 123
   - DockerCinderBackupImage
111 124
   services:
112 125
   - OS::TripleO::Services::CinderBackup
113 126
 
114 127
 - imagename: "{{namespace}}/{{name_prefix}}cinder-scheduler{{name_suffix}}:{{tag}}"
128
+  image_source: kolla
115 129
   params:
116 130
   - DockerCinderSchedulerImage
117 131
   services:
@@ -119,6 +133,7 @@ container_images_template:
119 133
   - OS::TripleO::Services::UndercloudCinderScheduler
120 134
 
121 135
 - imagename: "{{namespace}}/{{name_prefix}}cinder-volume{{name_suffix}}:{{tag}}"
136
+  image_source: kolla
122 137
   params:
123 138
   - DockerCinderVolumeImage
124 139
   services:
@@ -127,6 +142,7 @@ container_images_template:
127 142
   - OS::TripleO::Services::UndercloudCinderVolume
128 143
 
129 144
 - imagename: "{{namespace}}/{{name_prefix}}collectd{{name_suffix}}:{{tag}}"
145
+  image_source: kolla
130 146
   params:
131 147
   - DockerCollectdConfigImage
132 148
   - DockerCollectdImage
@@ -134,6 +150,7 @@ container_images_template:
134 150
   - OS::TripleO::Services::Collectd
135 151
 
136 152
 - imagename: "{{namespace}}/{{name_prefix}}congress-api{{name_suffix}}:{{tag}}"
153
+  image_source: kolla
137 154
   params:
138 155
   - DockerCongressApiImage
139 156
   - DockerCongressConfigImage
@@ -141,6 +158,7 @@ container_images_template:
141 158
   - OS::TripleO::Services::Congress
142 159
 
143 160
 - imagename: "{{namespace}}/{{name_prefix}}cron{{name_suffix}}:{{tag}}"
161
+  image_source: kolla
144 162
   params:
145 163
   - DockerCrondConfigImage
146 164
   - DockerCrondImage
@@ -148,6 +166,7 @@ container_images_template:
148 166
   - OS::TripleO::Services::ContainersLogrotateCrond
149 167
 
150 168
 - imagename: "{{namespace}}/{{name_prefix}}designate-api{{name_suffix}}:{{tag}}"
169
+  image_source: kolla
151 170
   params:
152 171
   - DockerDesignateApiImage
153 172
   services:
@@ -159,38 +178,45 @@ container_images_template:
159 178
   - OS::TripleO::Services::DesignateWorker
160 179
 
161 180
 - imagename: "{{namespace}}/{{name_prefix}}designate-backend-bind9{{name_suffix}}:{{tag}}"
181
+  image_source: kolla
162 182
   params:
163 183
   - DockerDesignateBackendBIND9Image
164 184
   services:
165 185
   - OS::TripleO::Services::DesignateWorker
166 186
 
167 187
 - imagename: "{{namespace}}/{{name_prefix}}designate-base{{name_suffix}}:{{tag}}"
188
+  image_source: kolla
168 189
 
169 190
 - imagename: "{{namespace}}/{{name_prefix}}designate-central{{name_suffix}}:{{tag}}"
191
+  image_source: kolla
170 192
   params:
171 193
   - DockerDesignateCentralImage
172 194
   services:
173 195
   - OS::TripleO::Services::DesignateCentral
174 196
 
175 197
 - imagename: "{{namespace}}/{{name_prefix}}designate-mdns{{name_suffix}}:{{tag}}"
198
+  image_source: kolla
176 199
   params:
177 200
   - DockerDesignateMDNSImage
178 201
   services:
179 202
   - OS::TripleO::Services::DesignateMDNS
180 203
 
181 204
 - imagename: "{{namespace}}/{{name_prefix}}designate-producer{{name_suffix}}:{{tag}}"
205
+  image_source: kolla
182 206
   params:
183 207
   - DockerDesignateProducerImage
184 208
   services:
185 209
   - OS::TripleO::Services::DesignateProducer
186 210
 
187 211
 - imagename: "{{namespace}}/{{name_prefix}}designate-sink{{name_suffix}}:{{tag}}"
212
+  image_source: kolla
188 213
   params:
189 214
   - DockerDesignateSinkImage
190 215
   services:
191 216
   - OS::TripleO::Services::DesignateSink
192 217
 
193 218
 - imagename: "{{namespace}}/{{name_prefix}}designate-worker{{name_suffix}}:{{tag}}"
219
+  image_source: kolla
194 220
   params:
195 221
   - DockerDesignateConfigImage
196 222
   - DockerDesignateWorkerImage
@@ -198,6 +224,7 @@ container_images_template:
198 224
   - OS::TripleO::Services::DesignateWorker
199 225
 
200 226
 - imagename: "{{namespace}}/{{name_prefix}}ec2-api{{name_suffix}}:{{tag}}"
227
+  image_source: kolla
201 228
   params:
202 229
   - DockerEc2ApiConfigImage
203 230
   - DockerEc2ApiImage
@@ -205,6 +232,7 @@ container_images_template:
205 232
   - OS::TripleO::Services::Ec2Api
206 233
 
207 234
 - imagename: "{{namespace}}/{{name_prefix}}etcd{{name_suffix}}:{{tag}}"
235
+  image_source: kolla
208 236
   params:
209 237
   - DockerEtcdConfigImage
210 238
   - DockerEtcdImage
@@ -212,6 +240,7 @@ container_images_template:
212 240
   - OS::TripleO::Services::Etcd
213 241
 
214 242
 - imagename: "{{namespace}}/{{name_prefix}}fluentd{{name_suffix}}:{{tag}}"
243
+  image_source: kolla
215 244
   params:
216 245
   - DockerFluentdConfigImage
217 246
   - DockerFluentdClientImage
@@ -221,6 +250,7 @@ container_images_template:
221 250
   - OS::TripleO::Services::Fluentd
222 251
 
223 252
 - imagename: "{{namespace}}/{{name_prefix}}glance-api{{name_suffix}}:{{tag}}"
253
+  image_source: kolla
224 254
   params:
225 255
   - DockerGlanceApiConfigImage
226 256
   - DockerGlanceApiImage
@@ -228,6 +258,7 @@ container_images_template:
228 258
   - OS::TripleO::Services::GlanceApi
229 259
 
230 260
 - imagename: "{{namespace}}/{{name_prefix}}gnocchi-api{{name_suffix}}:{{tag}}"
261
+  image_source: kolla
231 262
   params:
232 263
   - DockerGnocchiApiImage
233 264
   - DockerGnocchiConfigImage
@@ -240,6 +271,7 @@ container_images_template:
240 271
   - OS::TripleO::Services::UndercloudGnocchiStatsd
241 272
 
242 273
 - imagename: "{{namespace}}/{{name_prefix}}gnocchi-metricd{{name_suffix}}:{{tag}}"
274
+  image_source: kolla
243 275
   params:
244 276
   - DockerGnocchiMetricdImage
245 277
   services:
@@ -247,6 +279,7 @@ container_images_template:
247 279
   - OS::TripleO::Services::UndercloudGnocchiMetricd
248 280
 
249 281
 - imagename: "{{namespace}}/{{name_prefix}}gnocchi-statsd{{name_suffix}}:{{tag}}"
282
+  image_source: kolla
250 283
   params:
251 284
   - DockerGnocchiStatsdImage
252 285
   services:
@@ -254,6 +287,7 @@ container_images_template:
254 287
   - OS::TripleO::Services::UndercloudGnocchiStatsd
255 288
 
256 289
 - imagename: "{{namespace}}/{{name_prefix}}haproxy{{name_suffix}}:{{tag}}"
290
+  image_source: kolla
257 291
   params:
258 292
   - DockerHAProxyConfigImage
259 293
   - DockerHAProxyImage
@@ -262,8 +296,10 @@ container_images_template:
262 296
   - OS::TripleO::Services::UndercloudHAProxy
263 297
 
264 298
 - imagename: "{{namespace}}/{{name_prefix}}heat-all{{name_suffix}}:{{tag}}"
299
+  image_source: kolla
265 300
 
266 301
 - imagename: "{{namespace}}/{{name_prefix}}heat-api-cfn{{name_suffix}}:{{tag}}"
302
+  image_source: kolla
267 303
   params:
268 304
   - DockerHeatApiCfnConfigImage
269 305
   - DockerHeatApiCfnImage
@@ -271,6 +307,7 @@ container_images_template:
271 307
   - OS::TripleO::Services::HeatApiCfn
272 308
 
273 309
 - imagename: "{{namespace}}/{{name_prefix}}heat-api{{name_suffix}}:{{tag}}"
310
+  image_source: kolla
274 311
   params:
275 312
   - DockerHeatApiConfigImage
276 313
   - DockerHeatApiImage
@@ -280,12 +317,14 @@ container_images_template:
280 317
   - OS::TripleO::Services::HeatEngine
281 318
 
282 319
 - imagename: "{{namespace}}/{{name_prefix}}heat-engine{{name_suffix}}:{{tag}}"
320
+  image_source: kolla
283 321
   params:
284 322
   - DockerHeatEngineImage
285 323
   services:
286 324
   - OS::TripleO::Services::HeatEngine
287 325
 
288 326
 - imagename: "{{namespace}}/{{name_prefix}}horizon{{name_suffix}}:{{tag}}"
327
+  image_source: kolla
289 328
   params:
290 329
   - DockerHorizonConfigImage
291 330
   - DockerHorizonImage
@@ -293,6 +332,7 @@ container_images_template:
293 332
   - OS::TripleO::Services::Horizon
294 333
 
295 334
 - imagename: "{{namespace}}/{{name_prefix}}ironic-api{{name_suffix}}:{{tag}}"
335
+  image_source: kolla
296 336
   params:
297 337
   - DockerIronicApiImage
298 338
   - DockerIronicApiConfigImage
@@ -300,12 +340,14 @@ container_images_template:
300 340
   - OS::TripleO::Services::IronicApi
301 341
 
302 342
 - imagename: "{{namespace}}/{{name_prefix}}ironic-conductor{{name_suffix}}:{{tag}}"
343
+  image_source: kolla
303 344
   params:
304 345
   - DockerIronicConductorImage
305 346
   services:
306 347
   - OS::TripleO::Services::IronicConductor
307 348
 
308 349
 - imagename: "{{namespace}}/{{name_prefix}}ironic-inspector{{name_suffix}}:{{tag}}"
350
+  image_source: kolla
309 351
   params:
310 352
   - DockerIronicInspectorImage
311 353
   - DockerIronicInspectorConfigImage
@@ -313,6 +355,7 @@ container_images_template:
313 355
   - OS::TripleO::Services::IronicInspector
314 356
 
315 357
 - imagename: "{{namespace}}/{{name_prefix}}ironic-pxe{{name_suffix}}:{{tag}}"
358
+  image_source: kolla
316 359
   params:
317 360
   - DockerIronicConfigImage
318 361
   - DockerIronicPxeImage
@@ -321,6 +364,7 @@ container_images_template:
321 364
   - OS::TripleO::Services::IronicPxe
322 365
 
323 366
 - imagename: "{{namespace}}/{{name_prefix}}ironic-neutron-agent{{name_suffix}}:{{tag}}"
367
+  image_source: kolla
324 368
   params:
325 369
   - DockerIronicNeutronAgentImage
326 370
   - DockerNeutronConfigImage
@@ -328,6 +372,7 @@ container_images_template:
328 372
   - OS::TripleO::Services::IronicNeutronAgent
329 373
 
330 374
 - imagename: "{{namespace}}/{{name_prefix}}iscsid{{name_suffix}}:{{tag}}"
375
+  image_source: kolla
331 376
   params:
332 377
   - DockerIscsidConfigImage
333 378
   - DockerIscsidImage
@@ -335,6 +380,7 @@ container_images_template:
335 380
   - OS::TripleO::Services::Iscsid
336 381
 
337 382
 - imagename: "{{namespace}}/{{name_prefix}}keepalived{{name_suffix}}:{{tag}}"
383
+  image_source: kolla
338 384
   params:
339 385
   - DockerKeepalivedConfigImage
340 386
   - DockerKeepalivedImage
@@ -343,6 +389,7 @@ container_images_template:
343 389
   - OS::TripleO::Services::UndercloudKeepalived
344 390
 
345 391
 - imagename: "{{namespace}}/{{name_prefix}}keystone{{name_suffix}}:{{tag}}"
392
+  image_source: kolla
346 393
   params:
347 394
   - DockerKeystoneConfigImage
348 395
   - DockerKeystoneImage
@@ -350,6 +397,7 @@ container_images_template:
350 397
   - OS::TripleO::Services::Keystone
351 398
 
352 399
 - imagename: "{{namespace}}/{{name_prefix}}manila-api{{name_suffix}}:{{tag}}"
400
+  image_source: kolla
353 401
   params:
354 402
   - DockerManilaApiImage
355 403
   - DockerManilaConfigImage
@@ -359,20 +407,24 @@ container_images_template:
359 407
   - OS::TripleO::Services::ManilaShare
360 408
 
361 409
 - imagename: "{{namespace}}/{{name_prefix}}manila-base{{name_suffix}}:{{tag}}"
410
+  image_source: kolla
362 411
 
363 412
 - imagename: "{{namespace}}/{{name_prefix}}manila-scheduler{{name_suffix}}:{{tag}}"
413
+  image_source: kolla
364 414
   params:
365 415
   - DockerManilaSchedulerImage
366 416
   services:
367 417
   - OS::TripleO::Services::ManilaScheduler
368 418
 
369 419
 - imagename: "{{namespace}}/{{name_prefix}}manila-share{{name_suffix}}:{{tag}}"
420
+  image_source: kolla
370 421
   params:
371 422
   - DockerManilaShareImage
372 423
   services:
373 424
   - OS::TripleO::Services::ManilaShare
374 425
 
375 426
 - imagename: "{{namespace}}/{{name_prefix}}mariadb{{name_suffix}}:{{tag}}"
427
+  image_source: kolla
376 428
   params:
377 429
   - DockerClustercheckConfigImage
378 430
   - DockerClustercheckImage
@@ -383,6 +435,7 @@ container_images_template:
383 435
   - OS::TripleO::Services::MySQL
384 436
 
385 437
 - imagename: "{{namespace}}/{{name_prefix}}memcached{{name_suffix}}:{{tag}}"
438
+  image_source: kolla
386 439
   params:
387 440
   - DockerMemcachedConfigImage
388 441
   - DockerMemcachedImage
@@ -390,6 +443,7 @@ container_images_template:
390 443
   - OS::TripleO::Services::Memcached
391 444
 
392 445
 - imagename: "{{namespace}}/{{name_prefix}}mistral-api{{name_suffix}}:{{tag}}"
446
+  image_source: kolla
393 447
   params:
394 448
   - DockerMistralApiImage
395 449
   - DockerMistralConfigImage
@@ -400,24 +454,28 @@ container_images_template:
400 454
   - OS::TripleO::Services::MistralEventEngine
401 455
 
402 456
 - imagename: "{{namespace}}/{{name_prefix}}mistral-engine{{name_suffix}}:{{tag}}"
457
+  image_source: kolla
403 458
   params:
404 459
   - DockerMistralEngineImage
405 460
   services:
406 461
   - OS::TripleO::Services::MistralEngine
407 462
 
408 463
 - imagename: "{{namespace}}/{{name_prefix}}mistral-executor{{name_suffix}}:{{tag}}"
464
+  image_source: kolla
409 465
   params:
410 466
   - DockerMistralExecutorImage
411 467
   services:
412 468
   - OS::TripleO::Services::MistralExecutor
413 469
 
414 470
 - imagename: "{{namespace}}/{{name_prefix}}mistral-event-engine{{name_suffix}}:{{tag}}"
471
+  image_source: kolla
415 472
   params:
416 473
   - DockerMistralEventEngineImage
417 474
   services:
418 475
   - OS::TripleO::Services::MistralEventEngine
419 476
 
420 477
 - imagename: "{{namespace}}/{{name_prefix}}multipathd{{name_suffix}}:{{tag}}"
478
+  image_source: kolla
421 479
   params:
422 480
   - DockerMultipathdConfigImage
423 481
   - DockerMultipathdImage
@@ -425,24 +483,28 @@ container_images_template:
425 483
   - OS::TripleO::Services::Multipathd
426 484
 
427 485
 - imagename: "{{namespace}}/{{name_prefix}}neutron-dhcp-agent{{name_suffix}}:{{tag}}"
486
+  image_source: kolla
428 487
   params:
429 488
   - DockerNeutronDHCPImage
430 489
   services:
431 490
   - OS::TripleO::Services::NeutronDhcpAgent
432 491
 
433 492
 - imagename: "{{namespace}}/{{name_prefix}}neutron-l3-agent{{name_suffix}}:{{tag}}"
493
+  image_source: kolla
434 494
   params:
435 495
   - DockerNeutronL3AgentImage
436 496
   services:
437 497
   - OS::TripleO::Services::NeutronL3Agent
438 498
 
439 499
 - imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent{{name_suffix}}:{{tag}}"
500
+  image_source: kolla
440 501
   params:
441 502
   - DockerNeutronMetadataImage
442 503
   services:
443 504
   - OS::TripleO::Services::NeutronMetadataAgent
444 505
 
445 506
 - imagename: "{{namespace}}/{{name_prefix}}neutron-openvswitch-agent{{name_suffix}}:{{tag}}"
507
+  image_source: kolla
446 508
   params:
447 509
   - DockerOpenvswitchImage
448 510
   services:
@@ -450,6 +512,7 @@ container_images_template:
450 512
   - OS::TripleO::Services::NeutronOvsAgent
451 513
 
452 514
 - imagename: "{{namespace}}/{{name_prefix}}neutron-sriov-agent{{name_suffix}}:{{tag}}"
515
+  image_source: kolla
453 516
   params:
454 517
   - DockerNeutronSriovImage
455 518
   services:
@@ -457,6 +520,7 @@ container_images_template:
457 520
 
458 521
 {% if neutron_driver == "odl" %}
459 522
 - imagename: "{{namespace}}/{{name_prefix}}neutron-server-opendaylight{{name_suffix}}:{{tag}}"
523
+  image_source: kolla
460 524
   params:
461 525
   - DockerNeutronApiImage
462 526
   - DockerNeutronConfigImage
@@ -469,6 +533,7 @@ container_images_template:
469 533
 
470 534
 {% elif neutron_driver == "ovn" %}
471 535
 - imagename: "{{namespace}}/{{name_prefix}}neutron-server-ovn{{name_suffix}}:{{tag}}"
536
+  image_source: kolla
472 537
   params:
473 538
   - DockerNeutronApiImage
474 539
   - DockerNeutronConfigImage
@@ -477,6 +542,7 @@ container_images_template:
477 542
   - OS::TripleO::Services::NeutronServer
478 543
 
479 544
 - imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent-ovn{{name_suffix}}:{{tag}}"
545
+  image_source: kolla
480 546
   params:
481 547
   - DockerOvnMetadataImage
482 548
   services:
@@ -484,6 +550,7 @@ container_images_template:
484 550
 
485 551
 {% else %}
486 552
 - imagename: "{{namespace}}/{{name_prefix}}neutron-server{{name_suffix}}:{{tag}}"
553
+  image_source: kolla
487 554
   params:
488 555
   - DockerNeutronApiImage
489 556
   - DockerNeutronConfigImage
@@ -500,6 +567,7 @@ container_images_template:
500 567
 {% endif %}
501 568
 
502 569
 - imagename: "{{namespace}}/{{name_prefix}}nova-api{{name_suffix}}:{{tag}}"
570
+  image_source: kolla
503 571
   params:
504 572
   - DockerNovaApiImage
505 573
   - DockerNovaConfigImage
@@ -515,12 +583,14 @@ container_images_template:
515 583
   - OS::TripleO::Services::NovaMetadata
516 584
 
517 585
 - imagename: "{{namespace}}/{{name_prefix}}nova-compute-ironic{{name_suffix}}:{{tag}}"
586
+  image_source: kolla
518 587
   params:
519 588
   - DockerNovaComputeIronicImage
520 589
   services:
521 590
   - OS::TripleO::Services::NovaIronic
522 591
 
523 592
 - imagename: "{{namespace}}/{{name_prefix}}nova-compute{{name_suffix}}:{{tag}}"
593
+  image_source: kolla
524 594
   params:
525 595
   - DockerNovaComputeImage
526 596
   - DockerNovaLibvirtConfigImage
@@ -530,30 +600,35 @@ container_images_template:
530 600
   - OS::TripleO::Services::NovaMigrationTarget
531 601
 
532 602
 - imagename: "{{namespace}}/{{name_prefix}}nova-conductor{{name_suffix}}:{{tag}}"
603
+  image_source: kolla
533 604
   params:
534 605
   - DockerNovaConductorImage
535 606
   services:
536 607
   - OS::TripleO::Services::NovaConductor
537 608
 
538 609
 - imagename: "{{namespace}}/{{name_prefix}}nova-consoleauth{{name_suffix}}:{{tag}}"
610
+  image_source: kolla
539 611
   params:
540 612
   - DockerNovaConsoleauthImage
541 613
   services:
542 614
   - OS::TripleO::Services::NovaConsoleauth
543 615
 
544 616
 - imagename: "{{namespace}}/{{name_prefix}}nova-libvirt{{name_suffix}}:{{tag}}"
617
+  image_source: kolla
545 618
   params:
546 619
   - DockerNovaLibvirtImage
547 620
   services:
548 621
   - OS::TripleO::Services::NovaLibvirt
549 622
 
550 623
 - imagename: "{{namespace}}/{{name_prefix}}nova-novncproxy{{name_suffix}}:{{tag}}"
624
+  image_source: kolla
551 625
   params:
552 626
   - DockerNovaVncProxyImage
553 627
   services:
554 628
   - OS::TripleO::Services::NovaVncProxy
555 629
 
556 630
 - imagename: "{{namespace}}/{{name_prefix}}nova-placement-api{{name_suffix}}:{{tag}}"
631
+  image_source: kolla
557 632
   params:
558 633
   - DockerNovaPlacementConfigImage
559 634
   - DockerNovaPlacementImage
@@ -561,18 +636,21 @@ container_images_template:
561 636
   - OS::TripleO::Services::NovaPlacement
562 637
 
563 638
 - imagename: "{{namespace}}/{{name_prefix}}nova-scheduler{{name_suffix}}:{{tag}}"
639
+  image_source: kolla
564 640
   params:
565 641
   - DockerNovaSchedulerImage
566 642
   services:
567 643
   - OS::TripleO::Services::NovaScheduler
568 644
 
569 645
 - imagename: "{{namespace}}/{{name_prefix}}novajoin-notifier{{name_suffix}}:{{tag}}"
646
+  image_source: kolla
570 647
   params:
571 648
   - DockerNovajoinNotifierImage
572 649
   services:
573 650
   - OS::TripleO::Services::Novajoin
574 651
 
575 652
 - imagename: "{{namespace}}/{{name_prefix}}novajoin-server{{name_suffix}}:{{tag}}"
653
+  image_source: kolla
576 654
   params:
577 655
   - DockerNovajoinServerImage
578 656
   - DockerNovajoinConfigImage
@@ -580,8 +658,10 @@ container_images_template:
580 658
   - OS::TripleO::Services::Novajoin
581 659
 
582 660
 - imagename: "{{namespace}}/{{name_prefix}}octavia-base{{name_suffix}}:{{tag}}"
661
+  image_source: kolla
583 662
 
584 663
 - imagename: "{{namespace}}/{{name_prefix}}octavia-api{{name_suffix}}:{{tag}}"
664
+  image_source: kolla
585 665
   params:
586 666
   - DockerOctaviaApiImage
587 667
   - DockerOctaviaConfigImage
@@ -592,18 +672,21 @@ container_images_template:
592 672
   - OS::TripleO::Services::OctaviaWorker
593 673
 
594 674
 - imagename: "{{namespace}}/{{name_prefix}}octavia-health-manager{{name_suffix}}:{{tag}}"
675
+  image_source: kolla
595 676
   params:
596 677
   - DockerOctaviaHealthManagerImage
597 678
   services:
598 679
   - OS::TripleO::Services::OctaviaHealthManager
599 680
 
600 681
 - imagename: "{{namespace}}/{{name_prefix}}octavia-housekeeping{{name_suffix}}:{{tag}}"
682
+  image_source: kolla
601 683
   params:
602 684
   - DockerOctaviaHousekeepingImage
603 685
   services:
604 686
   - OS::TripleO::Services::OctaviaHousekeeping
605 687
 
606 688
 - imagename: "{{namespace}}/{{name_prefix}}octavia-worker{{name_suffix}}:{{tag}}"
689
+  image_source: kolla
607 690
   params:
608 691
   - DockerOctaviaWorkerImage
609 692
   services:
@@ -611,6 +694,7 @@ container_images_template:
611 694
 
612 695
 {% if neutron_driver == "odl" %}
613 696
 - imagename: "{{namespace}}/{{name_prefix}}opendaylight{{name_suffix}}:{{tag}}"
697
+  image_source: kolla
614 698
   params:
615 699
   - DockerOpendaylightApiImage
616 700
   - DockerOpendaylightConfigImage
@@ -620,8 +704,10 @@ container_images_template:
620 704
 
621 705
 {% if neutron_driver == "ovn" %}
622 706
 - imagename: "{{namespace}}/{{name_prefix}}ovn-base{{name_suffix}}:{{tag}}"
707
+  image_source: kolla
623 708
 
624 709
 - imagename: "{{namespace}}/{{name_prefix}}ovn-controller{{name_suffix}}:{{tag}}"
710
+  image_source: kolla
625 711
   params:
626 712
   - DockerOvnControllerConfigImage
627 713
   - DockerOvnControllerImage
@@ -629,12 +715,14 @@ container_images_template:
629 715
   - OS::TripleO::Services::OVNController
630 716
 
631 717
 - imagename: "{{namespace}}/{{name_prefix}}ovn-nb-db-server{{name_suffix}}:{{tag}}"
718
+  image_source: kolla
632 719
   params:
633 720
   - DockerOvnNbDbImage
634 721
   services:
635 722
   - OS::TripleO::Services::OVNDBs
636 723
 
637 724
 - imagename: "{{namespace}}/{{name_prefix}}ovn-northd{{name_suffix}}:{{tag}}"
725
+  image_source: kolla
638 726
   params:
639 727
   - DockerOvnNorthdImage
640 728
   - DockerOvnDbsImage
@@ -643,6 +731,7 @@ container_images_template:
643 731
   - OS::TripleO::Services::OVNDBs
644 732
 
645 733
 - imagename: "{{namespace}}/{{name_prefix}}ovn-sb-db-server{{name_suffix}}:{{tag}}"
734
+  image_source: kolla
646 735
   params:
647 736
   - DockerOvnSbDbImage
648 737
   services:
@@ -650,6 +739,7 @@ container_images_template:
650 739
 {% endif %}
651 740
 
652 741
 - imagename: "{{namespace}}/{{name_prefix}}panko-api{{name_suffix}}:{{tag}}"
742
+  image_source: kolla
653 743
   params:
654 744
   - DockerPankoApiImage
655 745
   - DockerPankoConfigImage
@@ -658,6 +748,7 @@ container_images_template:
658 748
   - OS::TripleO::Services::UndercloudPankoApi
659 749
 
660 750
 - imagename: "{{namespace}}/{{name_prefix}}qdrouterd{{name_suffix}}:{{tag}}"
751
+  image_source: kolla
661 752
   params:
662 753
   - DockerQdrouterdConfigImage
663 754
   - DockerQdrouterdImage
@@ -669,6 +760,7 @@ container_images_template:
669 760
   - OS::TripleO::Services::MetricsQdr
670 761
 
671 762
 - imagename: "{{namespace}}/{{name_prefix}}rabbitmq{{name_suffix}}:{{tag}}"
763
+  image_source: kolla
672 764
   params:
673 765
   - DockerRabbitmqConfigImage
674 766
   - DockerRabbitmqImage
@@ -678,6 +770,7 @@ container_images_template:
678 770
   - OS::TripleO::Services::OsloMessagingNotify
679 771
 
680 772
 - imagename: "{{namespace}}/{{name_prefix}}redis{{name_suffix}}:{{tag}}"
773
+  image_source: kolla
681 774
   params:
682 775
   - DockerRedisConfigImage
683 776
   - DockerRedisImage
@@ -686,6 +779,7 @@ container_images_template:
686 779
   - OS::TripleO::Services::UndercloudRedis
687 780
 
688 781
 - imagename: "{{namespace}}/{{name_prefix}}sahara-api{{name_suffix}}:{{tag}}"
782
+  image_source: kolla
689 783
   params:
690 784
   - DockerSaharaApiImage
691 785
   - DockerSaharaConfigImage
@@ -694,12 +788,14 @@ container_images_template:
694 788
   - OS::TripleO::Services::SaharaEngine
695 789
 
696 790
 - imagename: "{{namespace}}/{{name_prefix}}sahara-engine{{name_suffix}}:{{tag}}"
791
+  image_source: kolla
697 792
   params:
698 793
   - DockerSaharaEngineImage
699 794
   services:
700 795
   - OS::TripleO::Services::SaharaEngine
701 796
 
702 797
 - imagename: "{{namespace}}/{{name_prefix}}sensu-client{{name_suffix}}:{{tag}}"
798
+  image_source: kolla
703 799
   params:
704 800
   - DockerSensuClientImage
705 801
   - DockerSensuConfigImage
@@ -707,36 +803,42 @@ container_images_template:
707 803
   - OS::TripleO::Services::SensuClient
708 804
 
709 805
 - imagename: "{{namespace}}/{{name_prefix}}skydive-agent{{name_suffix}}:{{tag}}"
806
+  image_source: kolla
710 807
   params:
711 808
   - DockerSkydiveAgentImage
712 809
   services:
713 810
   - OS::TripleO::Services::SkydiveAgent
714 811
 
715 812
 - imagename: "{{namespace}}/{{name_prefix}}skydive-analyzer{{name_suffix}}:{{tag}}"
813
+  image_source: kolla
716 814
   params:
717 815
   - DockerSkydiveAnalyzerImage
718 816
   services:
719 817
   - OS::TripleO::Services::SkydiveAnalyzer
720 818
 
721 819
 - imagename: "{{namespace}}/{{name_prefix}}swift-account{{name_suffix}}:{{tag}}"
820
+  image_source: kolla
722 821
   params:
723 822
   - DockerSwiftAccountImage
724 823
   services:
725 824
   - OS::TripleO::Services::SwiftStorage
726 825
 
727 826
 - imagename: "{{namespace}}/{{name_prefix}}swift-container{{name_suffix}}:{{tag}}"
827
+  image_source: kolla
728 828
   params:
729 829
   - DockerSwiftContainerImage
730 830
   services:
731 831
   - OS::TripleO::Services::SwiftStorage
732 832
 
733 833
 - imagename: "{{namespace}}/{{name_prefix}}swift-object{{name_suffix}}:{{tag}}"
834
+  image_source: kolla
734 835
   params:
735 836
   - DockerSwiftObjectImage
736 837
   services:
737 838
   - OS::TripleO::Services::SwiftStorage
738 839
 
739 840
 - imagename: "{{namespace}}/{{name_prefix}}swift-proxy-server{{name_suffix}}:{{tag}}"
841
+  image_source: kolla
740 842
   params:
741 843
   - DockerSwiftConfigImage
742 844
   - DockerSwiftProxyImage
@@ -757,6 +859,7 @@ container_images_template:
757 859
 #   - OS::TripleO::Services::Tacker
758 860
 
759 861
 - imagename: "{{namespace}}/{{name_prefix}}tripleo-ui{{name_suffix}}:{{tag}}"
862
+  image_source: kolla
760 863
   params:
761 864
   - DockerTripleoUIConfigImage
762 865
   - DockerTripleoUIImage
@@ -764,6 +867,7 @@ container_images_template:
764 867
   - OS::TripleO::Services::TripleoUI
765 868
 
766 869
 - imagename: "{{namespace}}/{{name_prefix}}zaqar{{name_suffix}}:{{tag}}"
870
+  image_source: kolla
767 871
   params:
768 872
   - DockerZaqarConfigImage
769 873
   - DockerZaqarImage
@@ -771,6 +875,7 @@ container_images_template:
771 875
   - OS::TripleO::Services::Zaqar
772 876
 
773 877
 - imagename: "{{ceph_namespace}}/{{ceph_image}}:{{ceph_tag}}"
878
+  image_source: ceph
774 879
   params:
775 880
   - DockerCephDaemonImage
776 881
   services:
@@ -784,12 +889,14 @@ container_images_template:
784 889
   - OS::TripleO::Services::CephRbdMirror
785 890
 
786 891
 - imagename: "{{namespace}}/{{name_prefix}}tempest{{name_suffix}}:{{tag}}"
892
+  image_source: kolla
787 893
   params:
788 894
   - DockerTempestImage
789 895
   services:
790 896
   - OS::TripleO::Services::Tempest
791 897
 
792 898
 - imagename: "{{namespace}}/{{name_prefix}}rsyslog-base{{name_suffix}}:{{tag}}"
899
+  image_source: kolla
793 900
   params:
794 901
   - DockerRsyslogSidecarImage
795 902
   - DockerRsyslogSidecarConfigImage
@@ -799,24 +906,28 @@ container_images_template:
799 906
   - OS::TripleO::Services::SwiftStorage
800 907
 
801 908
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-ansible:{{openshift_tag}}"
909
+  image_source: openshift
802 910
   params:
803 911
   - DockerOpenShiftAnsibleImage
804 912
   services:
805 913
   - OS::TripleO::Services::OpenShift::Master
806 914
 
807 915
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-console:{{openshift_tag}}"
916
+  image_source: openshift
808 917
   params:
809 918
   - DockerOpenShiftConsoleImage
810 919
   services:
811 920
   - OS::TripleO::Services::OpenShift::Master
812 921
 
813 922
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-control-plane:{{openshift_tag}}"
923
+  image_source: openshift
814 924
   params:
815 925
   - DockerOpenShiftControlPlaneImage
816 926
   services:
817 927
   - OS::TripleO::Services::OpenShift::Master
818 928
 
819 929
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-deployer:{{openshift_tag}}"
930
+  image_source: openshift
820 931
   params:
821 932
   - DockerOpenShiftDeployerImage
822 933
   services:
@@ -825,24 +936,28 @@ container_images_template:
825 936
   - OS::TripleO::Services::OpenShift::Worker
826 937
 
827 938
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-docker-builder:{{openshift_tag}}"
939
+  image_source: openshift
828 940
   params:
829 941
   - DockerOpenShiftDockerBuilderImage
830 942
   services:
831 943
   - OS::TripleO::Services::OpenShift::Worker
832 944
 
833 945
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-docker-registry:{{openshift_tag}}"
946
+  image_source: openshift
834 947
   params:
835 948
   - DockerOpenShiftDockerRegistryImage
836 949
   services:
837 950
   - OS::TripleO::Services::OpenShift::Infra
838 951
 
839 952
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-haproxy-router:{{openshift_tag}}"
953
+  image_source: openshift
840 954
   params:
841 955
   - DockerOpenShiftHAProxyRouterImage
842 956
   services:
843 957
   - OS::TripleO::Services::OpenShift::Infra
844 958
 
845 959
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-node:{{openshift_tag}}"
960
+  image_source: openshift
846 961
   params:
847 962
   - DockerOpenShiftNodeImage
848 963
   services:
@@ -851,6 +966,7 @@ container_images_template:
851 966
   - OS::TripleO::Services::OpenShift::Worker
852 967
 
853 968
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-pod:{{openshift_tag}}"
969
+  image_source: openshift
854 970
   params:
855 971
   - DockerOpenShiftPodImage
856 972
   services:
@@ -859,78 +975,91 @@ container_images_template:
859 975
   - OS::TripleO::Services::OpenShift::Worker
860 976
 
861 977
 - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-web-console:{{openshift_tag}}"
978
+  image_source: openshift
862 979
   params:
863 980
   - DockerOpenShiftWebConsoleImage
864 981
   services:
865 982
   - OS::TripleO::Services::OpenShift::Master
866 983
 
867 984
 - imagename: "{{openshift_cockpit_namespace}}/{{openshift_cockpit_image}}:{{openshift_cockpit_tag}}"
985
+  image_source: openshift
868 986
   params:
869 987
   - DockerOpenShiftCockpitImage
870 988
   services:
871 989
   - OS::TripleO::Services::OpenShift::Master
872 990
 
873 991
 - imagename: "{{openshift_etcd_namespace}}/{{openshift_etcd_image}}:{{openshift_etcd_tag}}"
992
+  image_source: openshift
874 993
   params:
875 994
   - DockerOpenShiftEtcdImage
876 995
   services:
877 996
   - OS::TripleO::Services::OpenShift::Master
878 997
 
879 998
 - imagename: "{{openshift_gluster_namespace}}/{{openshift_gluster_image}}:{{openshift_gluster_tag}}"
999
+  image_source: openshift
880 1000
   params:
881 1001
   - DockerOpenShiftGlusterFSImage
882 1002
   services:
883 1003
   - OS::TripleO::Services::OpenShift::GlusterFS
884 1004
 
885 1005
 - imagename: "{{openshift_gluster_namespace}}/{{openshift_gluster_block_image}}:{{openshift_gluster_tag}}"
1006
+  image_source: openshift
886 1007
   params:
887 1008
   - DockerOpenShiftGlusterFSBlockImage
888 1009
   services:
889 1010
   - OS::TripleO::Services::OpenShift::GlusterFS
890 1011
 
891 1012
 - imagename: "{{openshift_heketi_namespace}}/{{openshift_heketi_image}}:{{openshift_heketi_tag}}"
1013
+  image_source: openshift
892 1014
   params:
893 1015
   - DockerOpenShiftGlusterFSHeketiImage
894 1016
   services:
895 1017
   - OS::TripleO::Services::OpenShift::GlusterFS
896 1018
 
897 1019
 - imagename: "{{openshift_cluster_monitoring_namespace}}/{{openshift_cluster_monitoring_image}}:{{openshift_cluster_monitoring_tag}}"
1020
+  image_source: openshift
898 1021
   params:
899 1022
   - DockerOpenShiftClusterMonitorOperatorImage
900 1023
   services:
901 1024
   - OS::TripleO::Services::OpenShift::Infra
902 1025
 
903 1026
 - imagename: "{{openshift_configmap_reload_namespace}}/{{openshift_configmap_reload_image}}:{{openshift_configmap_reload_tag}}"
1027
+  image_source: openshift
904 1028
   params:
905 1029
   - DockerOpenShiftConfigmapReloaderImage
906 1030
   services:
907 1031
   - OS::TripleO::Services::OpenShift::Infra
908 1032
 
909 1033
 - imagename: "{{openshift_prometheus_operator_namespace}}/{{openshift_prometheus_operator_image}}:{{openshift_prometheus_operator_tag}}"
1034
+  image_source: openshift
910 1035
   params:
911 1036
   - DockerOpenShiftPrometheusOperatorImage
912 1037
   services:
913 1038
   - OS::TripleO::Services::OpenShift::Infra
914 1039
 
915 1040
 - imagename: "{{openshift_prometheus_config_reload_namespace}}/{{openshift_prometheus_config_reload_image}}:{{openshift_prometheus_config_reload_tag}}"
1041
+  image_source: openshift
916 1042
   params:
917 1043
   - DockerOpenShiftPrometheusConfigReloaderImage
918 1044
   services:
919 1045
   - OS::TripleO::Services::OpenShift::Infra
920 1046
 
921 1047
 - imagename: "{{openshift_namespace}}/prometheus:{{openshift_prometheus_tag}}"
1048
+  image_source: openshift
922 1049
   params:
923 1050
   - DockerOpenShiftPrometheusImage
924 1051
   services:
925 1052
   - OS::TripleO::Services::OpenShift::Infra
926 1053
 
927 1054
 - imagename: "{{openshift_namespace}}/prometheus-alertmanager:{{openshift_prometheus_alertmanager_tag}}"
1055
+  image_source: openshift
928 1056
   params:
929 1057
   - DockerOpenShiftPrometheusAlertmanagerImage
930 1058
   services:
931 1059
   - OS::TripleO::Services::OpenShift::Infra
932 1060
 
933 1061
 - imagename: "{{openshift_namespace}}/prometheus-node-exporter:{{openshift_prometheus_node_exporter_tag}}"
1062
+  image_source: openshift
934 1063
   params:
935 1064
   - DockerOpenShiftPrometheusNodeExporterImage
936 1065
   services:
@@ -939,12 +1068,14 @@ container_images_template:
939 1068
   - OS::TripleO::Services::OpenShift::Infra
940 1069
 
941 1070
 - imagename: "{{openshift_namespace}}/oauth-proxy:{{openshift_oauth_proxy_tag}}"
1071
+  image_source: openshift
942 1072
   params:
943 1073
   - DockerOpenShiftOauthProxyImage
944 1074
   services:
945 1075
   - OS::TripleO::Services::OpenShift::Infra
946 1076
 
947 1077
 - imagename: "{{openshift_kube_rbac_proxy_namespace}}/{{openshift_kube_rbac_proxy_image}}:{{openshift_kube_rbac_proxy_tag}}"
1078
+  image_source: openshift
948 1079
   params:
949 1080
   - DockerOpenShiftKubeRbacProxyImage
950 1081
   services:
@@ -952,12 +1083,14 @@ container_images_template:
952 1083
   - OS::TripleO::Services::OpenShift::Worker
953 1084
 
954 1085
 - imagename: "{{openshift_kube_state_metrics_namespace}}/{{openshift_kube_state_metrics_image}}:{{openshift_kube_state_metrics_tag}}"
1086
+  image_source: openshift
955 1087
   params:
956 1088
   - DockerOpenShiftKubeStateMetricsImage
957 1089
   services:
958 1090
   - OS::TripleO::Services::OpenShift::Infra
959 1091
 
960 1092
 - imagename: "{{openshift_grafana_namespace}}/grafana:{{openshift_grafana_tag}}"
1093
+  image_source: openshift
961 1094
   params:
962 1095
   - DockerOpenShiftGrafanaImage
963 1096
   services:

+ 3
- 0
tripleo_common/image/kolla_builder.py View File

@@ -442,6 +442,9 @@ class KollaImageBuilder(base.BaseImageManager):
442 442
         container_images = self.load_config_files(self.CONTAINER_IMAGES) or []
443 443
         container_images.sort(key=lambda i: i.get('imagename'))
444 444
         for i in container_images:
445
+            # Do not attempt to build containers that are not from kolla
446
+            if not i.get('image_source', '') == 'kolla':
447
+                continue
445 448
             image = self.imagename_to_regex(i.get('imagename'))
446 449
             if image:
447 450
                 cmd.append(image)

+ 80
- 28
tripleo_common/tests/image/test_kolla_builder.py View File

@@ -42,26 +42,40 @@ kb.init_prepare_defaults(DEFAULTS_PATH)
42 42
 
43 43
 filedata = six.u("""container_images:
44 44
 - imagename: docker.io/tripleomaster/heat-docker-agents-centos:latest
45
+  image_source: kolla
45 46
   push_destination: localhost:8787
46 47
 - imagename: docker.io/tripleomaster/centos-binary-nova-compute:liberty
48
+  image_source: kolla
47 49
   uploader: docker
48 50
   push_destination: localhost:8787
49 51
 - imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:liberty
52
+  image_source: kolla
50 53
   uploader: docker
51 54
 - imagename: docker.io/tripleomaster/image-with-missing-tag
55
+  image_source: kolla
56
+  push_destination: localhost:8787
57
+- imagename: docker.io/tripleomaster/skip-build
58
+  image_source: foo
52 59
   push_destination: localhost:8787
53 60
 """)
54 61
 
55 62
 template_filedata = six.u("""
56 63
 container_images_template:
57 64
 - imagename: "{{namespace}}/heat-docker-agents-centos:latest"
65
+  image_source: kolla
58 66
   push_destination: "{{push_destination}}"
59 67
 - imagename: "{{namespace}}/{{name_prefix}}nova-compute{{name_suffix}}:{{tag}}"
68
+  image_source: kolla
60 69
   uploader: "docker"
61 70
   push_destination: "{{push_destination}}"
62 71
 - imagename: "{{namespace}}/{{name_prefix}}nova-libvirt{{name_suffix}}:{{tag}}"
72
+  image_source: kolla
63 73
   uploader: "docker"
64 74
 - imagename: "{{namespace}}/image-with-missing-tag"
75
+  image_source: kolla
76
+  push_destination: "{{push_destination}}"
77
+- imagename: "{{namespace}}/skip-build"
78
+  image_source: foo
65 79
   push_destination: "{{push_destination}}"
66 80
 """)
67 81
 
@@ -371,18 +385,25 @@ class TestKollaImageBuilderTemplate(base.TestCase):
371 385
             tag='liberty'
372 386
         )
373 387
         container_images = [{
388
+            'image_source': 'kolla',
374 389
             'imagename': 'docker.io/tripleomaster/'
375 390
                          'centos-binary-nova-compute:liberty',
376 391
             'push_destination': 'localhost:8787',
377 392
             'uploader': 'docker'
378 393
         }, {
394
+            'image_source': 'kolla',
379 395
             'imagename': 'docker.io/tripleomaster/'
380 396
                          'centos-binary-nova-libvirt:liberty',
381 397
             'push_destination': 'localhost:8787',
382 398
             'uploader': 'docker'
383 399
         }, {
400
+            'image_source': 'kolla',
384 401
             'imagename': 'docker.io/tripleomaster/image-with-missing-tag',
385 402
             'push_destination': 'localhost:8787'
403
+        }, {
404
+            'image_source': 'foo',
405
+            'imagename': 'docker.io/tripleomaster/skip-build',
406
+            'push_destination': 'localhost:8787'
386 407
         }]
387 408
         self.assertEqual(container_images, result)
388 409
 
@@ -423,23 +444,32 @@ class TestKollaImageBuilderTemplate(base.TestCase):
423 444
 
424 445
     def test_container_images_yaml_in_sync(self):
425 446
         remove_images = [
426
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
447
+            {'image_source': 'kolla',
448
+             'imagename': 'docker.io/tripleomaster/centos-binary'
427 449
                           '-neutron-server-opendaylight:current-tripleo'},
428
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
450
+            {'image_source': 'kolla',
451
+             'imagename': 'docker.io/tripleomaster/centos-binary'
429 452
                           '-neutron-server-ovn:current-tripleo'},
430
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
453
+            {'image_source': 'kolla',
454
+             'imagename': 'docker.io/tripleomaster/centos-binary'
431 455
                           '-ovn-base:current-tripleo'},
432
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
456
+            {'image_source': 'kolla',
457
+             'imagename': 'docker.io/tripleomaster/centos-binary'
433 458
                           '-opendaylight:current-tripleo'},
434
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
459
+            {'image_source': 'kolla',
460
+             'imagename': 'docker.io/tripleomaster/centos-binary'
435 461
                           '-ovn-northd:current-tripleo'},
436
-            {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
462
+            {'image_source': 'kolla',
463
+             'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
437 464
                           'controller:current-tripleo'},
438
-            {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
465
+            {'image_source': 'kolla',
466
+             'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
439 467
                           'nb-db-server:current-tripleo'},
440
-            {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
468
+            {'image_source': 'kolla',
469
+             'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
441 470
                           'sb-db-server:current-tripleo'},
442
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
471
+            {'image_source': 'kolla',
472
+             'imagename': 'docker.io/tripleomaster/centos-binary'
443 473
                           '-neutron-metadata-agent-ovn:current-tripleo'}]
444 474
         self._test_container_images_yaml_in_sync_helper(
445 475
             remove_images=remove_images)
@@ -447,21 +477,29 @@ class TestKollaImageBuilderTemplate(base.TestCase):
447 477
     def test_container_images_yaml_in_sync_for_odl(self):
448 478
         # remove neutron-server image reference from overcloud_containers.yaml
449 479
         remove_images = [
450
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
480
+            {'image_source': 'kolla',
481
+             'imagename': 'docker.io/tripleomaster/centos-binary'
451 482
                           '-neutron-server:current-tripleo'},
452
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
483
+            {'image_source': 'kolla',
484
+             'imagename': 'docker.io/tripleomaster/centos-binary'
453 485
                           '-neutron-server-ovn:current-tripleo'},
454
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
486
+            {'image_source': 'kolla',
487
+             'imagename': 'docker.io/tripleomaster/centos-binary'
455 488
                           '-ovn-base:current-tripleo'},
456
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
489
+            {'image_source': 'kolla',
490
+             'imagename': 'docker.io/tripleomaster/centos-binary'
457 491
                           '-ovn-northd:current-tripleo'},
458
-            {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
492
+            {'image_source': 'kolla',
493
+             'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
459 494
                           'controller:current-tripleo'},
460
-            {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
495
+            {'image_source': 'kolla',
496
+             'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
461 497
                           'nb-db-server:current-tripleo'},
462
-            {'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
498
+            {'image_source': 'kolla',
499
+             'imagename': 'docker.io/tripleomaster/centos-binary-ovn-'
463 500
                           'sb-db-server:current-tripleo'},
464
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
501
+            {'image_source': 'kolla',
502
+             'imagename': 'docker.io/tripleomaster/centos-binary'
465 503
                           '-neutron-metadata-agent-ovn:current-tripleo'}]
466 504
         self._test_container_images_yaml_in_sync_helper(
467 505
             neutron_driver='odl', remove_images=remove_images)
@@ -469,11 +507,14 @@ class TestKollaImageBuilderTemplate(base.TestCase):
469 507
     def test_container_images_yaml_in_sync_for_ovn(self):
470 508
         # remove neutron-server image reference from overcloud_containers.yaml
471 509
         remove_images = [
472
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
510
+            {'image_source': 'kolla',
511
+             'imagename': 'docker.io/tripleomaster/centos-binary'
473 512
                           '-neutron-server:current-tripleo'},
474
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
513
+            {'image_source': 'kolla',
514
+             'imagename': 'docker.io/tripleomaster/centos-binary'
475 515
                           '-neutron-server-opendaylight:current-tripleo'},
476
-            {'imagename': 'docker.io/tripleomaster/centos-binary'
516
+            {'image_source': 'kolla',
517
+             'imagename': 'docker.io/tripleomaster/centos-binary'
477 518
                           '-opendaylight:current-tripleo'}]
478 519
         self._test_container_images_yaml_in_sync_helper(
479 520
             neutron_driver='ovn', remove_images=remove_images)
@@ -542,7 +583,8 @@ class TestPrepare(base.TestCase):
542 583
     def test_prepare_simple(self, mock_get):
543 584
         self.assertEqual({
544 585
             'container_images.yaml': [
545
-                {'imagename': '192.0.2.0:8787/t/p-nova-compute:l'}
586
+                {'image_source': 'kolla',
587
+                 'imagename': '192.0.2.0:8787/t/p-nova-compute:l'}
546 588
             ],
547 589
             'environments/containers-default-parameters.yaml': {
548 590
                 'DockerNovaComputeImage': '192.0.2.0:8787/t/p-nova-compute:l',
@@ -568,7 +610,8 @@ class TestPrepare(base.TestCase):
568 610
     def test_prepare_includes(self, mock_get):
569 611
         self.assertEqual({
570 612
             'container_images.yaml': [
571
-                {'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'}
613
+                {'image_source': 'kolla',
614
+                 'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'}
572 615
             ],
573 616
             'environments/containers-default-parameters.yaml': {
574 617
                 'DockerNovaLibvirtImage': '192.0.2.0:8787/t/p-nova-libvirt:l'
@@ -592,7 +635,8 @@ class TestPrepare(base.TestCase):
592 635
         # assert same result as includes only. includes trumps excludes
593 636
         self.assertEqual({
594 637
             'container_images.yaml': [
595
-                {'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'}
638
+                {'image_source': 'kolla',
639
+                 'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'}
596 640
             ],
597 641
             'environments/containers-default-parameters.yaml': {
598 642
                 'DockerNovaLibvirtImage': '192.0.2.0:8787/t/p-nova-libvirt:l'
@@ -616,6 +660,7 @@ class TestPrepare(base.TestCase):
616 660
     def test_prepare_push_dest(self, mock_get):
617 661
         self.assertEqual({
618 662
             'container_images.yaml': [{
663
+                'image_source': 'kolla',
619 664
                 'imagename': 'docker.io/t/p-nova-api:l',
620 665
                 'push_destination': '192.0.2.0:8787',
621 666
             }],
@@ -650,6 +695,7 @@ class TestPrepare(base.TestCase):
650 695
         mock_gur.return_value = '192.0.2.0:8787'
651 696
         self.assertEqual({
652 697
             'container_images.yaml': [{
698
+                'image_source': 'kolla',
653 699
                 'imagename': 'docker.io/t/p-nova-api:l',
654 700
                 'push_destination': '192.0.2.0:8787',
655 701
             }],
@@ -682,6 +728,7 @@ class TestPrepare(base.TestCase):
682 728
     def test_prepare_ceph(self, mock_get):
683 729
         self.assertEqual({
684 730
             'container_images.yaml': [{
731
+                'image_source': 'ceph',
685 732
                 'imagename': '192.0.2.0:8787/t/ceph:l',
686 733
             }],
687 734
             'environments/containers-default-parameters.yaml': {
@@ -704,7 +751,8 @@ class TestPrepare(base.TestCase):
704 751
     def test_prepare_neutron_driver_default(self, mock_get):
705 752
         self.assertEqual({
706 753
             'container_images.yaml': [
707
-                {'imagename': 't/p-neutron-server:l'}
754
+                {'image_source': 'kolla',
755
+                 'imagename': 't/p-neutron-server:l'}
708 756
             ],
709 757
             'environments/containers-default-parameters.yaml': {
710 758
                 'DockerNeutronApiImage': 't/p-neutron-server:l',
@@ -731,8 +779,10 @@ class TestPrepare(base.TestCase):
731 779
     def test_prepare_neutron_driver_ovn(self, mock_get):
732 780
         self.assertEqual({
733 781
             'container_images.yaml': [
734
-                {'imagename': 't/p-neutron-server-ovn:l'},
735
-                {'imagename': 't/p-ovn-controller:l'}
782
+                {'image_source': 'kolla',
783
+                 'imagename': 't/p-neutron-server-ovn:l'},
784
+                {'image_source': 'kolla',
785
+                 'imagename': 't/p-ovn-controller:l'}
736 786
             ],
737 787
             'environments/containers-default-parameters.yaml': {
738 788
                 'DockerNeutronApiImage': 't/p-neutron-server-ovn:l',
@@ -762,8 +812,10 @@ class TestPrepare(base.TestCase):
762 812
     def test_prepare_neutron_driver_odl(self, mock_get):
763 813
         self.assertEqual({
764 814
             'container_images.yaml': [
765
-                {'imagename': 't/neutron-server-opendaylight:l'},
766
-                {'imagename': 't/opendaylight:l'}
815
+                {'image_source': 'kolla',
816
+                 'imagename': 't/neutron-server-opendaylight:l'},
817
+                {'image_source': 'kolla',
818
+                 'imagename': 't/opendaylight:l'}
767 819
             ],
768 820
             'environments/containers-default-parameters.yaml': {
769 821
                 'DockerNeutronApiImage': 't/neutron-server-opendaylight:l',

Loading…
Cancel
Save