bump references to xena

Author: msherman64

README.md

@@ -12,7 +12,7 @@ source $HOME/.local/bin/env
 ```
 git clone https://github.com/chameleoncloud/chi-in-a-box
 cd chi-in-a-box
-git checkout minimal/wallaby-kvm
+git checkout minimal/xena-kvm
 ```
 
 ## install the ciab tools

requirements.txt

@@ -1,7 +1,7 @@
-# ansible version for kolla-ansible wallaby release
-ansible<3.0
+# ansible version for kolla-ansible xena release
+ansible<5.0
 
-git+https://github.com/chameleoncloud/kolla-ansible@backport/wallaby
+git+https://github.com/chameleoncloud/kolla-ansible@backport/xena
 
 # client tools
 openstackclient

site-config/globals.yml

@@ -87,7 +87,7 @@ keystone_oidc_client_secret: "public"
 keystone_oidc_provider_metadata_url: "{{ keystone_identity_providers[0].identifier }}/.well-known/openid-configuration"
 
 # keystone must support mapping multiple projects or keycloak federation will fail
-keystone_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone:5c89f0c
-keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:5c89f0c
-keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:5c89f0c
-horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:5c89f0c
+keystone_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone:e193d13
+keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:e193d13
+keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:e193d13
+horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:e193d13

site-config/inventory/02-kolla-hosts

@@ -18,16 +18,6 @@ compute
 storage
 monitoring
 
-[chrony-server:children]
-haproxy
-
-[chrony:children]
-control
-network
-compute
-storage
-monitoring
-
 [collectd:children]
 compute
 
@@ -65,7 +55,7 @@ control
 [hacluster-remote:children]
 compute
 
-[haproxy:children]
+[loadbalancer:children]
 network
 
 [mariadb:children]
@@ -165,9 +155,6 @@ control
 control
 compute
 
-[panko:children]
-control
-
 [gnocchi:children]
 control
 
@@ -177,10 +164,6 @@ control
 [trove:children]
 control
 
-# Tempest
-[tempest:children]
-control
-
 [senlin:children]
 control
 
@@ -193,9 +176,6 @@ control
 [watcher:children]
 control
 
-[rally:children]
-control
-
 [octavia:children]
 control
 
@@ -410,9 +390,6 @@ monasca
 [monasca-grafana:children]
 monasca
 
-[monasca-log-transformer:children]
-monasca
-
 [monasca-log-persister:children]
 monasca
 
@@ -533,10 +510,6 @@ compute
 [cyborg-conductor:children]
 cyborg
 
-# Panko
-[panko-api:children]
-panko
-
 # Gnocchi
 [gnocchi-api:children]
 gnocchi
@@ -690,7 +663,7 @@ storage
 mariadb
 
 [prometheus-haproxy-exporter:children]
-haproxy
+loadbalancer
 
 [prometheus-memcached-exporter:children]
 memcached
@@ -714,6 +687,9 @@ elasticsearch
 [prometheus-blackbox-exporter:children]
 monitoring
 
+[prometheus-libvirt-exporter:children]
+compute
+
 [masakari-api:children]
 control
 

site-config/passwords.yml.example

@@ -88,9 +88,6 @@ cloudkitty_keystone_password:
 cyborg_database_password:
 cyborg_keystone_password:
 
-panko_database_password:
-panko_keystone_password:
-
 freezer_database_password:
 freezer_keystone_password:
 
@@ -141,8 +138,6 @@ ceilometer_keystone_password:
 watcher_database_password:
 watcher_keystone_password:
 
-rally_database_password:
-
 senlin_database_password:
 senlin_keystone_password:
 
@@ -252,6 +247,11 @@ prometheus_alertmanager_password:
 ###############################
 keystone_federation_openid_crypto_password:
 
+####################
+# Ceph RadosGW options
+####################
+ceph_rgw_keystone_password:
+
 ##################
 # libvirt options
 ##################