Skip to content

Commit 3a1a058

Browse files
committed
Update refs for victoria
1 parent f53460c commit 3a1a058

File tree

6 files changed

+130
-130
lines changed

6 files changed

+130
-130
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ source $HOME/.local/bin/env
1212
```
1313
git clone https://github.com/chameleoncloud/chi-in-a-box
1414
cd chi-in-a-box
15-
git checkout ciab_minimal/2023.1
15+
git checkout ciab_minimal/victoria-kvm-ci
1616
```
1717

1818
## install the ciab tools
1919
```
2020
uv venv .venv
2121
source .venv/bin/activate
22-
uv pip install -r requirements.txt
23-
kolla-ansible install-deps
22+
uv pip install -r requirements.txt
2423
```
2524

2625
## Customize site-config

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# ansible version for kolla-ansible 2023.1 release
1+
# ansible version for kolla-ansible victoria release
22
ansible
33
ansible-core>=2.13,<=2.14
44

5-
git+https://github.com/ChameleonCloud/kolla-ansible@backport/2023.1
5+
git+https://github.com/ChameleonCloud/kolla-ansible@backport/victoria
66

77
# client tools
88
openstackclient

site-config/globals.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ keystone_oidc_client_secret: "public"
8787
keystone_oidc_provider_metadata_url: "{{ keystone_identity_providers[0].identifier }}/.well-known/openid-configuration"
8888

8989
# keystone must support mapping multiple projects or keycloak federation will fail
90-
keystone_image_full: ghcr.io/chameleoncloud/kolla/keystone:2023.1-ubuntu-jammy
91-
keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/keystone-fernet:2023.1-ubuntu-jammy
92-
keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/keystone-ssh:2023.1-ubuntu-jammy
93-
horizon_image_full: ghcr.io/chameleoncloud/kolla/horizon:2023.1-ubuntu-jammy
90+
keystone_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone:fafc71b
91+
keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:fafc71b
92+
keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:fafc71b
93+
horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:fafc71b

site-config/inventory/02-kolla-hosts

Lines changed: 90 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ compute
1818
storage
1919
monitoring
2020

21+
[chrony-server:children]
22+
haproxy
23+
24+
[chrony:children]
25+
control
26+
network
27+
compute
28+
storage
29+
monitoring
30+
2131
[collectd:children]
2232
compute
2333

@@ -36,20 +46,23 @@ monitoring
3646
[kafka:children]
3747
control
3848

49+
[karbor:children]
50+
control
51+
52+
[kibana:children]
53+
control
54+
3955
[telegraf:children]
4056
compute
4157
control
4258
monitoring
4359
network
4460
storage
4561

46-
[hacluster:children]
62+
[elasticsearch:children]
4763
control
4864

49-
[hacluster-remote:children]
50-
compute
51-
52-
[loadbalancer:children]
65+
[haproxy:children]
5366
network
5467

5568
[mariadb:children]
@@ -61,6 +74,9 @@ control
6174
[outward-rabbitmq:children]
6275
control
6376

77+
[qdrouterd:children]
78+
control
79+
6480
[monasca-agent:children]
6581
compute
6682
control
@@ -127,6 +143,9 @@ control
127143
[magnum:children]
128144
control
129145

146+
[qinling:children]
147+
control
148+
130149
[sahara:children]
131150
control
132151

@@ -146,6 +165,9 @@ control
146165
control
147166
compute
148167

168+
[panko:children]
169+
control
170+
149171
[gnocchi:children]
150172
control
151173

@@ -155,15 +177,28 @@ control
155177
[trove:children]
156178
control
157179

180+
# Tempest
181+
[tempest:children]
182+
control
183+
158184
[senlin:children]
159185
control
160186

187+
[vmtp:children]
188+
control
189+
161190
[vitrage:children]
162191
control
163192

164193
[watcher:children]
165194
control
166195

196+
[rally:children]
197+
control
198+
199+
[searchlight:children]
200+
control
201+
167202
[octavia:children]
168203
control
169204

@@ -182,21 +217,15 @@ control
182217
[zun:children]
183218
control
184219

185-
[skyline:children]
186-
control
220+
[skydive:children]
221+
monitoring
187222

188223
[redis:children]
189224
control
190225

191226
[blazar:children]
192227
control
193228

194-
[venus:children]
195-
monitoring
196-
197-
[letsencrypt:children]
198-
loadbalancer
199-
200229
# Additional control implemented here. These groups allow you to control which
201230
# services run on which hosts at a per-service level.
202231
#
@@ -217,12 +246,9 @@ common
217246
[kolla-toolbox:children]
218247
common
219248

220-
[opensearch:children]
221-
control
222-
223-
# Opensearch dashboards
224-
[opensearch-dashboards:children]
225-
opensearch
249+
# Elasticsearch Curator
250+
[elasticsearch-curator:children]
251+
elasticsearch
226252

227253
# Glance
228254
[glance-api:children]
@@ -282,10 +308,6 @@ neutron
282308
[ironic-neutron-agent:children]
283309
neutron
284310

285-
[neutron-ovn-agent:children]
286-
compute
287-
network
288-
289311
# Cinder
290312
[cinder-api:children]
291313
cinder
@@ -322,6 +344,16 @@ ironic
322344
[tgtd:children]
323345
storage
324346

347+
# Karbor
348+
[karbor-api:children]
349+
karbor
350+
351+
[karbor-protection:children]
352+
karbor
353+
354+
[karbor-operationengine:children]
355+
karbor
356+
325357
# Manila
326358
[manila-api:children]
327359
manila
@@ -335,9 +367,6 @@ network
335367
[manila-data:children]
336368
manila
337369

338-
[manila-nfs-ganesha:children]
339-
manila
340-
341370
# Swift
342371
[swift-proxy-server:children]
343372
swift
@@ -391,6 +420,12 @@ monasca-agent
391420
[monasca-api:children]
392421
monasca
393422

423+
[monasca-grafana:children]
424+
monasca
425+
426+
[monasca-log-transformer:children]
427+
monasca
428+
394429
[monasca-log-persister:children]
395430
monasca
396431

@@ -423,10 +458,10 @@ ironic
423458
[ironic-inspector:children]
424459
ironic
425460

426-
[ironic-tftp:children]
461+
[ironic-pxe:children]
427462
ironic
428463

429-
[ironic-http:children]
464+
[ironic-ipxe:children]
430465
ironic
431466

432467
# Magnum
@@ -436,6 +471,13 @@ magnum
436471
[magnum-conductor:children]
437472
magnum
438473

474+
# Qinling
475+
[qinling-api:children]
476+
qinling
477+
478+
[qinling-engine:children]
479+
qinling
480+
439481
# Sahara
440482
[sahara-api:children]
441483
sahara
@@ -511,6 +553,10 @@ compute
511553
[cyborg-conductor:children]
512554
cyborg
513555

556+
# Panko
557+
[panko-api:children]
558+
panko
559+
514560
# Gnocchi
515561
[gnocchi-api:children]
516562
gnocchi
@@ -559,6 +605,13 @@ senlin
559605
[senlin-health-manager:children]
560606
senlin
561607

608+
# Searchlight
609+
[searchlight-api:children]
610+
searchlight
611+
612+
[searchlight-listener:children]
613+
searchlight
614+
562615
# Octavia
563616
[octavia-api:children]
564617
octavia
@@ -614,12 +667,13 @@ compute
614667
[zun-cni-daemon:children]
615668
compute
616669

617-
# Skyline
618-
[skyline-apiserver:children]
619-
skyline
670+
# Skydive
671+
[skydive-analyzer:children]
672+
skydive
620673

621-
[skyline-console:children]
622-
skyline
674+
[skydive-agent:children]
675+
compute
676+
network
623677

624678
# Tacker
625679
[tacker-server:children]
@@ -659,14 +713,11 @@ compute
659713
network
660714
storage
661715

662-
[prometheus-pushgateway:children]
663-
monitoring
664-
665716
[prometheus-mysqld-exporter:children]
666717
mariadb
667718

668719
[prometheus-haproxy-exporter:children]
669-
loadbalancer
720+
haproxy
670721

671722
[prometheus-memcached-exporter:children]
672723
memcached
@@ -685,30 +736,18 @@ monitoring
685736
monitoring
686737

687738
[prometheus-elasticsearch-exporter:children]
688-
opensearch
739+
elasticsearch
689740

690741
[prometheus-blackbox-exporter:children]
691742
monitoring
692743

693-
[prometheus-libvirt-exporter:children]
694-
compute
695-
696-
[prometheus-msteams:children]
697-
prometheus-alertmanager
698-
699-
[prometheus-snmp-exporter:children]
700-
monitoring
701-
702744
[masakari-api:children]
703745
control
704746

705747
[masakari-engine:children]
706748
control
707749

708-
[masakari-hostmonitor:children]
709-
control
710-
711-
[masakari-instancemonitor:children]
750+
[masakari-monitors:children]
712751
compute
713752

714753
[ovn-controller:children]
@@ -732,30 +771,3 @@ ovn-database
732771

733772
[ovn-sb-db:children]
734773
ovn-database
735-
736-
[venus-api:children]
737-
venus
738-
739-
[venus-manager:children]
740-
venus
741-
742-
[letsencrypt-webserver:children]
743-
letsencrypt
744-
745-
[letsencrypt-lego:children]
746-
letsencrypt
747-
748-
[doni:children]
749-
control
750-
751-
[doni-api:children]
752-
doni
753-
754-
[doni-worker:children]
755-
doni
756-
757-
[tunelo:children]
758-
control
759-
760-
[tunelo-api:children]
761-
tunelo

0 commit comments

Comments
 (0)