diff --git a/.github/workflows/ciab_ci.yml b/.github/workflows/ciab_ci.yml index 637793de..b914cf47 100644 --- a/.github/workflows/ciab_ci.yml +++ b/.github/workflows/ciab_ci.yml @@ -9,7 +9,7 @@ on: jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: checkout chi-in-a-box uses: actions/checkout@v4 diff --git a/README.md b/README.md index f5b5ebc7..9b9acdc3 100644 --- a/README.md +++ b/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/yoga-kvm +git checkout minimal/zed-kvm ``` ## install the ciab tools diff --git a/requirements.txt b/requirements.txt index e97e3828..55d219e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -# ansible version for kolla-ansible yoga release +# ansible version for kolla-ansible zed release ansible>=4,<6 -git+https://github.com/chameleoncloud/kolla-ansible@backport/yoga +git+https://github.com/chameleoncloud/kolla-ansible@backport/zed # client tools openstackclient diff --git a/site-config/globals.yml b/site-config/globals.yml index 2c6134e9..3cbbc591 100644 --- a/site-config/globals.yml +++ b/site-config/globals.yml @@ -91,7 +91,10 @@ keystone_oidc_provider_metadata_url: "{{ identity_provider_url }}/.well-known/op keystone_federation_oidc_jwks_uri: "{{ identity_provider_url }}/protocol/openid-connect/certs" # keystone must support mapping multiple projects or keycloak federation will fail -keystone_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone:807524d -keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-fernet:807524d -keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-keystone-ssh:807524d -horizon_image_full: ghcr.io/chameleoncloud/kolla/ubuntu-source-horizon:807524d +keystone_image_full: ghcr.io/chameleoncloud/kolla/keystone:b61c66c +keystone_fernet_image_full: ghcr.io/chameleoncloud/kolla/keystone-fernet:b61c66c +keystone_ssh_image_full: ghcr.io/chameleoncloud/kolla/keystone-ssh:b61c66c +horizon_image_full: ghcr.io/chameleoncloud/kolla/horizon:b61c66c + +# added logging to loki +fluentd_image_full: ghcr.io/chameleoncloud/kolla/fluentd:b61c66c diff --git a/site-config/inventory/02-kolla-hosts b/site-config/inventory/02-kolla-hosts index b00ed17c..ee6822ab 100644 --- a/site-config/inventory/02-kolla-hosts +++ b/site-config/inventory/02-kolla-hosts @@ -36,9 +36,6 @@ monitoring [kafka:children] control -[kibana:children] -control - [telegraf:children] compute control @@ -46,9 +43,6 @@ monitoring network storage -[elasticsearch:children] -control - [hacluster:children] control @@ -67,9 +61,6 @@ control [outward-rabbitmq:children] control -[qdrouterd:children] -control - [monasca-agent:children] compute control @@ -200,6 +191,9 @@ control [blazar:children] control +[venus:children] +monitoring + # Additional control implemented here. These groups allow you to control which # services run on which hosts at a per-service level. # @@ -220,13 +214,13 @@ common [kolla-toolbox:children] common -# Elasticsearch Curator -[elasticsearch-curator:children] -elasticsearch - [opensearch:children] control +# TODO: This is used for cleanup and can be removed in the Antelope cycle. +[elasticsearch-curator:children] +opensearch + # Opensearch dashboards [opensearch-dashboards:children] opensearch @@ -683,7 +677,6 @@ monitoring monitoring [prometheus-elasticsearch-exporter:children] -elasticsearch opensearch [prometheus-blackbox-exporter:children] @@ -728,3 +721,9 @@ ovn-database [ovn-sb-db:children] ovn-database + +[venus-api:children] +venus + +[venus-manager:children] +venus diff --git a/site-config/passwords.yml.example b/site-config/passwords.yml.example index b79a10af..1a1fa57c 100644 --- a/site-config/passwords.yml.example +++ b/site-config/passwords.yml.example @@ -15,6 +15,8 @@ cinder_rbd_secret_uuid: database_password: # Password for the dedicated backup user account mariadb_backup_database_password: +# Password for the monitor user +mariadb_monitor_password: #################### # Docker options @@ -115,10 +117,6 @@ murano_database_password: murano_keystone_password: murano_agent_rabbitmq_password: -monasca_agent_password: -monasca_database_password: -monasca_keystone_password: - ironic_database_password: ironic_keystone_password: @@ -168,6 +166,9 @@ zun_keystone_password: vitrage_database_password: vitrage_keystone_password: +venus_database_password: +venus_keystone_password: + masakari_database_password: masakari_keystone_password: @@ -207,11 +208,6 @@ gnocchi_project_id: gnocchi_resource_id: gnocchi_user_id: -#################### -# Qdrouterd options -#################### -qdrouterd_password: - #################### # RabbitMQ options #################### @@ -227,11 +223,6 @@ outward_rabbitmq_cluster_cookie: haproxy_password: keepalived_password: -#################### -# Kibana options -#################### -kibana_password: - #################### # etcd options #################### @@ -263,6 +254,12 @@ ceph_rgw_keystone_password: ################## libvirt_sasl_password: +############ +# ProxySQL +############ +proxysql_admin_password: +proxysql_stats_password: + ############ # OpenSearch ############