Update refs for victoria

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

requirements.txt

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

site-config/inventory/02-kolla-hosts

@@ -20,6 +20,16 @@ compute
 storage
 monitoring
 
+[chrony-server:children]
+haproxy
+
+[chrony:children]
+control
+network
+compute
+storage
+monitoring
+
 [collectd:children]
 compute
 
@@ -170,9 +180,6 @@ control
 control
 compute
 
-[congress:children]
-control
-
 [panko:children]
 control
 
@@ -241,6 +248,19 @@ control
 # function appropriately. For example, neutron-metadata-agent must run on the
 # same host as the l3-agent and (depending on configuration) the dhcp-agent.
 
+# Common
+[cron:children]
+common
+
+[fluentd:children]
+common
+
+[kolla-logs:children]
+common
+
+[kolla-toolbox:children]
+common
+
 # Elasticsearch Curator
 [elasticsearch-curator:children]
 elasticsearch
@@ -547,16 +567,6 @@ compute
 [cyborg-conductor:children]
 cyborg
 
-# Congress
-[congress-api:children]
-congress
-
-[congress-datasource:children]
-congress
-
-[congress-policy-engine:children]
-congress
-
 # Panko
 [panko-api:children]
 panko

site-config/passwords.yml.example

@@ -146,9 +146,6 @@ ceilometer_keystone_password:
 watcher_database_password:
 watcher_keystone_password:
 
-congress_database_password:
-congress_keystone_password:
-
 rally_database_password:
 
 senlin_database_password:
@@ -171,6 +168,8 @@ octavia_ca_password:
 
 searchlight_keystone_password:
 
+searchlight_keystone_password:
+
 tacker_database_password:
 tacker_keystone_password:
 
@@ -207,6 +206,10 @@ bifrost_ssh_key:
   private_key:
   public_key:
 
+octavia_amp_ssh_key:
+  private_key:
+  public_key:
+
 ####################
 # Gnocchi options
 ####################