bump to wallaby

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/victoria-kvm
+git checkout minimal/wallaby-kvm
 ```
 
 ## install the ciab tools

requirements.txt

@@ -1,7 +1,7 @@
-# ansible version for kolla-ansible victoria release
-ansible<2.10
+# ansible version for kolla-ansible wallaby release
+ansible<3.0
 
-git+https://github.com/ChameleonCloud/kolla-ansible@backport/victoria
+git+https://github.com/chameleoncloud/kolla-ansible@backport/wallaby
 
 # 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:fafc71b
-keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:fafc71b
-keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:fafc71b
-horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:fafc71b
+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

site-config/inventory/02-kolla-hosts

@@ -10,10 +10,8 @@ control
 
 # You can explicitly specify which hosts run each project by updating the
 # groups in the sections below. Common services are grouped together.
-[chrony-server:children]
-haproxy
 
-[chrony:children]
+[common:children]
 control
 network
 compute
@@ -48,9 +46,6 @@ monitoring
 [kafka:children]
 control
 
-[karbor:children]
-control
-
 [kibana:children]
 control
 
@@ -64,18 +59,14 @@ storage
 [elasticsearch:children]
 control
 
-[haproxy:children]
-network
+[hacluster:children]
+control
 
-[hyperv]
-#hyperv_host
+[hacluster-remote:children]
+compute
 
-[hyperv:vars]
-#ansible_user=user
-#ansible_password=password
-#ansible_port=5986
-#ansible_connection=winrm
-#ansible_winrm_server_cert_validation=ignore
+[haproxy:children]
+network
 
 [mariadb:children]
 control
@@ -102,9 +93,6 @@ monitoring
 [storm:children]
 monitoring
 
-[mongodb:children]
-control
-
 [keystone:children]
 control
 
@@ -158,9 +146,6 @@ control
 [magnum:children]
 control
 
-[qinling:children]
-control
-
 [sahara:children]
 control
 
@@ -211,9 +196,6 @@ control
 [rally:children]
 control
 
-[searchlight:children]
-control
-
 [octavia:children]
 control
 
@@ -309,6 +291,7 @@ neutron
 
 [neutron-ovn-metadata-agent:children]
 compute
+network
 
 [neutron-bgp-dragent:children]
 neutron
@@ -358,16 +341,6 @@ ironic
 [tgtd:children]
 storage
 
-# Karbor
-[karbor-api:children]
-karbor
-
-[karbor-protection:children]
-karbor
-
-[karbor-operationengine:children]
-karbor
-
 # Manila
 [manila-api:children]
 manila
@@ -485,13 +458,6 @@ magnum
 [magnum-conductor:children]
 magnum
 
-# Qinling
-[qinling-api:children]
-qinling
-
-[qinling-engine:children]
-qinling
-
 # Sahara
 [sahara-api:children]
 sahara
@@ -619,17 +585,13 @@ senlin
 [senlin-health-manager:children]
 senlin
 
-# Searchlight
-[searchlight-api:children]
-searchlight
-
-[searchlight-listener:children]
-searchlight
-
 # Octavia
 [octavia-api:children]
 octavia
 
+[octavia-driver-agent:children]
+octavia
+
 [octavia-health-manager:children]
 octavia
 
@@ -758,7 +720,10 @@ control
 [masakari-engine:children]
 control
 
-[masakari-monitors:children]
+[masakari-hostmonitor:children]
+control
+
+[masakari-instancemonitor:children]
 compute
 
 [ovn-controller:children]

site-config/passwords.yml.example

@@ -66,10 +66,6 @@ glance_keystone_password:
 gnocchi_database_password:
 gnocchi_keystone_password:
 
-karbor_database_password:
-karbor_keystone_password:
-karbor_openstack_infra_id:
-
 kuryr_keystone_password:
 
 nova_database_password:
@@ -122,7 +118,6 @@ murano_agent_rabbitmq_password:
 
 monasca_agent_password:
 monasca_database_password:
-monasca_grafana_admin_password:
 monasca_keystone_password:
 
 ironic_database_password:
@@ -165,10 +160,7 @@ manila_keystone_password:
 octavia_database_password:
 octavia_keystone_password:
 octavia_ca_password:
-
-searchlight_keystone_password:
-
-searchlight_keystone_password:
+octavia_client_ca_password:
 
 tacker_database_password:
 tacker_keystone_password:
@@ -184,9 +176,6 @@ masakari_keystone_password:
 
 memcache_secret_key:
 
-qinling_database_password:
-qinling_keystone_password:
-
 # HMAC secret key
 osprofiler_secret:
 
@@ -252,23 +241,18 @@ etcd_cluster_token:
 ####################
 redis_master_password:
 
-################
-# XenAPI options
-################
-xenserver_password:
-
 ####################
 # Prometheus options
 ####################
 prometheus_mysql_exporter_database_password:
 prometheus_alertmanager_password:
 
-##################
-# libvirt options
-##################
-libvirt_sasl_password:
-
 ###############################
 # OpenStack identity federation
 ###############################
 keystone_federation_openid_crypto_password:
+
+##################
+# libvirt options
+##################
+libvirt_sasl_password: