Skip to content

Commit 4ebc066

Browse files
committed
bump refs to yoga
1 parent 767a204 commit 4ebc066

File tree

5 files changed

+31
-15
lines changed

5 files changed

+31
-15
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ 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 minimal/xena-kvm
15+
git checkout minimal/yoga-kvm
1616
```
1717

1818
## install the ciab tools
@@ -21,7 +21,7 @@ uv venv .venv
2121
source .venv/bin/activate
2222
uv pip install \
2323
-r requirements.txt \
24-
git+https://github.com/chameleoncloud/kolla-ansible@backport/xena
24+
git+https://github.com/chameleoncloud/kolla-ansible@backport/yoga
2525
```
2626

2727
## Customize site-config

site-config/globals.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ kolla_install_type: "source"
3838
docker_namespace: kolla
3939
docker_registry: docker.chameleoncloud.org
4040

41-
keystone_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone:e193d13
42-
keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:e193d13
43-
keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:e193d13
44-
horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:e193d13
41+
keystone_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone:807524d
42+
keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:807524d
43+
keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:807524d
44+
horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:807524d
4545

4646
# default superadmin user and project
4747
keystone_admin_user: "admin"

site-config/inventory/02-kolla-hosts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,6 @@ control
167167
[senlin:children]
168168
control
169169

170-
[vmtp:children]
171-
control
172-
173170
[vitrage:children]
174171
control
175172

@@ -227,6 +224,13 @@ common
227224
[elasticsearch-curator:children]
228225
elasticsearch
229226

227+
[opensearch:children]
228+
control
229+
230+
# Opensearch dashboards
231+
[opensearch-dashboards:children]
232+
opensearch
233+
230234
# Glance
231235
[glance-api:children]
232236
glance
@@ -387,9 +391,6 @@ monasca-agent
387391
[monasca-api:children]
388392
monasca
389393

390-
[monasca-grafana:children]
391-
monasca
392-
393394
[monasca-log-persister:children]
394395
monasca
395396

@@ -422,10 +423,10 @@ ironic
422423
[ironic-inspector:children]
423424
ironic
424425

425-
[ironic-pxe:children]
426+
[ironic-tftp:children]
426427
ironic
427428

428-
[ironic-ipxe:children]
429+
[ironic-http:children]
429430
ironic
430431

431432
# Magnum
@@ -683,13 +684,17 @@ monitoring
683684

684685
[prometheus-elasticsearch-exporter:children]
685686
elasticsearch
687+
opensearch
686688

687689
[prometheus-blackbox-exporter:children]
688690
monitoring
689691

690692
[prometheus-libvirt-exporter:children]
691693
compute
692694

695+
[prometheus-msteams:children]
696+
prometheus-alertmanager
697+
693698
[masakari-api:children]
694699
control
695700

site-config/passwords.yml.example

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ vmware_dvs_host_password:
2929
vmware_nsxv_password:
3030
vmware_vcenter_host_password:
3131
nsxv3_api_password:
32+
vmware_nsxp_api_password:
33+
vmware_nsxp_metadata_proxy_shared_secret:
3234

3335
#####################
3436
# Hitachi NAS support
@@ -194,6 +196,10 @@ octavia_amp_ssh_key:
194196
private_key:
195197
public_key:
196198

199+
neutron_ssh_key:
200+
private_key:
201+
public_key:
202+
197203
####################
198204
# Gnocchi options
199205
####################
@@ -256,3 +262,8 @@ ceph_rgw_keystone_password:
256262
# libvirt options
257263
##################
258264
libvirt_sasl_password:
265+
266+
############
267+
# OpenSearch
268+
############
269+
opensearch_dashboards_password:

testing/setup_ciab.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ uv venv .venv
2929
source .venv/bin/activate
3030
uv pip install \
3131
-r requirements.txt \
32-
git+https://github.com/chameleoncloud/kolla-ansible@backport/xena
32+
git+https://github.com/chameleoncloud/kolla-ansible@backport/yoga
3333

3434
# setup passwords. Not overwriting to permit repeated runs
3535
cp --no-clobber site-config/passwords.yml{.example,}

0 commit comments

Comments
 (0)