From 4f2fe24715b315192ae7c2c0388ddb47b619a775 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Wed, 10 Feb 2021 20:16:24 +0100 Subject: [PATCH] Updates for stable branch creation 21.01 Set default branch for git review/gerrit. Switch tests to stable. Switch to using stable charm-helpers branch. Switch to using stable charm.openstack branch. Switch to using stable zaza branch. Switch to using stable zaza-openstack-tests branch. Change-Id: I3057ab1e5919184ac2c4632c4b713f07239de455 --- .gitreview | 2 + src/test-requirements.txt | 4 +- src/tests/bundles/bionic-rocky-ha.yaml | 26 +++++------ src/tests/bundles/bionic-rocky-lxd.yaml | 24 +++++----- src/tests/bundles/bionic-stein-ha.yaml | 26 +++++------ src/tests/bundles/bionic-train-ha-ovn.yaml | 30 ++++++------- src/tests/bundles/bionic-train-ha.yaml | 28 ++++++------ src/tests/bundles/bionic-ussuri-ha-ovn.yaml | 30 ++++++------- src/tests/bundles/bionic-ussuri-ha.yaml | 28 ++++++------ src/tests/bundles/focal-ussuri-ha-ovn.yaml | 44 +++++++++---------- src/tests/bundles/focal-ussuri-ha.yaml | 42 +++++++++--------- src/tests/bundles/focal-victoria-ha-ovn.yaml | 44 +++++++++---------- src/tests/bundles/focal-victoria-ha.yaml | 42 +++++++++--------- src/tests/bundles/groovy-victoria-ha-ovn.yaml | 44 +++++++++---------- src/tests/bundles/groovy-victoria-ha.yaml | 42 +++++++++--------- src/wheelhouse.txt | 4 +- test-requirements.txt | 2 +- 17 files changed, 232 insertions(+), 230 deletions(-) diff --git a/.gitreview b/.gitreview index f4af0b17..ee76dd9d 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-octavia.git + +defaultbranch=stable/21.01 diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 520681e1..cf7632c0 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -11,5 +11,5 @@ charm-tools>=2.4.4 keyring<21 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) -git+https://github.com/openstack-charmers/zaza.git#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack diff --git a/src/tests/bundles/bionic-rocky-ha.yaml b/src/tests/bundles/bionic-rocky-ha.yaml index 677561b9..6f9893fa 100644 --- a/src/tests/bundles/bionic-rocky-ha.yaml +++ b/src/tests/bundles/bionic-rocky-ha.yaml @@ -76,21 +76,21 @@ relations: - octavia-diskimage-retrofit:certificates applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky mysql: constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-rocky @@ -100,7 +100,7 @@ applications: enable-dvr: True neutron-openvswitch: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -111,7 +111,7 @@ applications: bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -119,7 +119,7 @@ applications: firewall-driver: openvswitch nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-rocky @@ -127,13 +127,13 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: cloud:bionic-rocky debug: True hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: constraints: cores=8 @@ -147,20 +147,20 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: source: ppa:simplestreams-dev/trunk use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-uca-pocket: rocky retrofit-series: bionic vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-rocky-lxd.yaml b/src/tests/bundles/bionic-rocky-lxd.yaml index 828aedf3..638cb301 100644 --- a/src/tests/bundles/bionic-rocky-lxd.yaml +++ b/src/tests/bundles/bionic-rocky-lxd.yaml @@ -83,14 +83,14 @@ relations: - octavia-diskimage-retrofit:certificates applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky to: - lxd:1 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky @@ -98,12 +98,12 @@ applications: - lxd:0 mysql: constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 to: - lxd:0 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-rocky @@ -113,7 +113,7 @@ applications: to: - lxd:1 neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-rocky @@ -125,7 +125,7 @@ applications: - 3 neutron-openvswitch: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -135,7 +135,7 @@ applications: firewall-driver: openvswitch nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-rocky @@ -145,7 +145,7 @@ applications: - lxd:1 nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 options: openstack-origin: cloud:bionic-rocky @@ -167,21 +167,21 @@ applications: - lxd:1 - lxd:2 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - lxd:0 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: source: ppa:simplestreams-dev/trunk use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: bionic vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-stein-ha.yaml b/src/tests/bundles/bionic-stein-ha.yaml index 0668a95d..d9d929ba 100644 --- a/src/tests/bundles/bionic-stein-ha.yaml +++ b/src/tests/bundles/bionic-stein-ha.yaml @@ -76,21 +76,21 @@ relations: - octavia-diskimage-retrofit:certificates applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-stein keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-stein mysql: constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-stein @@ -100,7 +100,7 @@ applications: enable-dvr: True neutron-openvswitch: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -111,7 +111,7 @@ applications: bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -119,7 +119,7 @@ applications: firewall-driver: openvswitch nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-stein @@ -127,13 +127,13 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: cloud:bionic-stein debug: True hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: constraints: cores=8 @@ -147,20 +147,20 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: source: ppa:simplestreams-dev/trunk use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-uca-pocket: stein retrofit-series: bionic vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-train-ha-ovn.yaml b/src/tests/bundles/bionic-train-ha-ovn.yaml index 7b6c6054..07975cdf 100644 --- a/src/tests/bundles/bionic-train-ha-ovn.yaml +++ b/src/tests/bundles/bionic-train-ha-ovn.yaml @@ -85,22 +85,22 @@ relations: - octavia:ha applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train mysql: constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-train @@ -110,7 +110,7 @@ applications: manage-neutron-plugin-legacy-mode: False nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-train @@ -118,14 +118,14 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: cloud:bionic-train debug: True hacluster-octavia: series: bionic - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster octavia: constraints: cores=8 series: bionic @@ -137,37 +137,37 @@ applications: spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: source: ppa:simplestreams-dev/trunk use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-uca-pocket: train retrofit-series: bionic placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: cloud:bionic-train debug: true neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: cloud:bionic-train ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-train-ha.yaml b/src/tests/bundles/bionic-train-ha.yaml index 36a5a30f..0dd90a21 100644 --- a/src/tests/bundles/bionic-train-ha.yaml +++ b/src/tests/bundles/bionic-train-ha.yaml @@ -81,21 +81,21 @@ relations: - placement:certificates applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train mysql: constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-train @@ -105,7 +105,7 @@ applications: enable-dvr: True neutron-openvswitch: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -116,7 +116,7 @@ applications: bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -124,7 +124,7 @@ applications: firewall-driver: openvswitch nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-train @@ -132,13 +132,13 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: cloud:bionic-train debug: True hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: constraints: cores=8 @@ -152,27 +152,27 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: source: ppa:simplestreams-dev/trunk use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-uca-pocket: train retrofit-series: bionic placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: cloud:bionic-train debug: true vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-ussuri-ha-ovn.yaml b/src/tests/bundles/bionic-ussuri-ha-ovn.yaml index c5f142c2..bca282a8 100644 --- a/src/tests/bundles/bionic-ussuri-ha-ovn.yaml +++ b/src/tests/bundles/bionic-ussuri-ha-ovn.yaml @@ -85,22 +85,22 @@ relations: - octavia:ha applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri/proposed keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri/proposed mysql: constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: # NOTE(fnordahl): At current state of upstream Neutron development this @@ -112,7 +112,7 @@ applications: neutron-security-groups: True nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-ussuri/proposed @@ -120,14 +120,14 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: cloud:bionic-ussuri/proposed debug: True hacluster-octavia: series: bionic - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster octavia: constraints: cores=8 series: bionic @@ -139,37 +139,37 @@ applications: spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: source: ppa:simplestreams-dev/trunk use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-uca-pocket: ussuri retrofit-series: bionic placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: cloud:bionic-ussuri/proposed debug: true neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: cloud:bionic-ussuri/proposed ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-ussuri-ha.yaml b/src/tests/bundles/bionic-ussuri-ha.yaml index f667f03c..b96d8209 100644 --- a/src/tests/bundles/bionic-ussuri-ha.yaml +++ b/src/tests/bundles/bionic-ussuri-ha.yaml @@ -81,21 +81,21 @@ relations: - placement:certificates applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri/proposed keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri/proposed mysql: constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-ussuri/proposed @@ -106,7 +106,7 @@ applications: manage-neutron-plugin-legacy-mode: True neutron-openvswitch: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -117,7 +117,7 @@ applications: bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: series: bionic - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -125,7 +125,7 @@ applications: firewall-driver: openvswitch nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-ussuri/proposed @@ -133,13 +133,13 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: cloud:bionic-ussuri/proposed debug: True hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: constraints: cores=8 @@ -153,27 +153,27 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: source: ppa:simplestreams-dev/trunk use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-uca-pocket: ussuri retrofit-series: bionic placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: cloud:bionic-ussuri/proposed debug: true vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/focal-ussuri-ha-ovn.yaml b/src/tests/bundles/focal-ussuri-ha-ovn.yaml index ac4d4727..10db93f4 100644 --- a/src/tests/bundles/focal-ussuri-ha-ovn.yaml +++ b/src/tests/bundles/focal-ussuri-ha-ovn.yaml @@ -92,36 +92,36 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: distro keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: distro octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: distro @@ -130,7 +130,7 @@ applications: neutron-security-groups: True nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: distro @@ -138,14 +138,14 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: distro debug: True hacluster-octavia: series: focal - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster octavia: constraints: cores=8 series: focal @@ -157,35 +157,35 @@ applications: spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: focal placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: distro debug: true neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: distro ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/focal-ussuri-ha.yaml b/src/tests/bundles/focal-ussuri-ha.yaml index 5249d552..91acff80 100644 --- a/src/tests/bundles/focal-ussuri-ha.yaml +++ b/src/tests/bundles/focal-ussuri-ha.yaml @@ -88,35 +88,35 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: distro keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: distro octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: distro @@ -127,7 +127,7 @@ applications: manage-neutron-plugin-legacy-mode: True neutron-openvswitch: series: focal - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -138,7 +138,7 @@ applications: bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: series: focal - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -146,7 +146,7 @@ applications: firewall-driver: openvswitch nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: distro @@ -154,13 +154,13 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: distro debug: True hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: constraints: cores=8 @@ -174,25 +174,25 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: focal placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: distro debug: true vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/focal-victoria-ha-ovn.yaml b/src/tests/bundles/focal-victoria-ha-ovn.yaml index 538df0ef..fb3194e1 100644 --- a/src/tests/bundles/focal-victoria-ha-ovn.yaml +++ b/src/tests/bundles/focal-victoria-ha-ovn.yaml @@ -92,36 +92,36 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:focal-victoria keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:focal-victoria octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:focal-victoria @@ -130,7 +130,7 @@ applications: neutron-security-groups: True nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:focal-victoria @@ -138,14 +138,14 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: cloud:focal-victoria debug: True hacluster-octavia: series: focal - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster octavia: constraints: cores=8 series: focal @@ -157,35 +157,35 @@ applications: spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: focal placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: cloud:focal-victoria debug: true neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: cloud:focal-victoria ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/focal-victoria-ha.yaml b/src/tests/bundles/focal-victoria-ha.yaml index 29d6883c..5f6b1ca8 100644 --- a/src/tests/bundles/focal-victoria-ha.yaml +++ b/src/tests/bundles/focal-victoria-ha.yaml @@ -88,35 +88,35 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:focal-victoria keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:focal-victoria octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:focal-victoria @@ -127,7 +127,7 @@ applications: manage-neutron-plugin-legacy-mode: True neutron-openvswitch: series: focal - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -138,7 +138,7 @@ applications: bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: series: focal - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -146,7 +146,7 @@ applications: firewall-driver: openvswitch nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:focal-victoria @@ -154,13 +154,13 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: cloud:focal-victoria debug: True hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: constraints: cores=8 @@ -174,25 +174,25 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: focal placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: cloud:focal-victoria debug: true vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/groovy-victoria-ha-ovn.yaml b/src/tests/bundles/groovy-victoria-ha-ovn.yaml index 5bdfca75..ac4abbfb 100644 --- a/src/tests/bundles/groovy-victoria-ha-ovn.yaml +++ b/src/tests/bundles/groovy-victoria-ha-ovn.yaml @@ -92,36 +92,36 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: distro keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: distro octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 neutron-api: constraints: cores=4 - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: distro @@ -130,7 +130,7 @@ applications: neutron-security-groups: True nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: distro @@ -138,14 +138,14 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: distro debug: True hacluster-octavia: series: groovy - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster octavia: constraints: cores=8 series: groovy @@ -157,35 +157,35 @@ applications: spare-pool-size: 2 loadbalancer-topology: 'ACTIVE_STANDBY' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: groovy placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: distro debug: true neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn ovn-central: constraints: mem=3072M - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: distro ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/groovy-victoria-ha.yaml b/src/tests/bundles/groovy-victoria-ha.yaml index f9e0137e..3332e15b 100644 --- a/src/tests/bundles/groovy-victoria-ha.yaml +++ b/src/tests/bundles/groovy-victoria-ha.yaml @@ -88,35 +88,35 @@ relations: - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: distro keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: distro octavia-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: distro @@ -127,7 +127,7 @@ applications: manage-neutron-plugin-legacy-mode: True neutron-openvswitch: series: groovy - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -138,7 +138,7 @@ applications: bridge-mappings: physnet1:br-ex neutron-openvswitch-octavia: series: groovy - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 options: debug: True @@ -146,7 +146,7 @@ applications: firewall-driver: openvswitch nova-cloud-controller: constraints: mem=7168M - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: distro @@ -154,13 +154,13 @@ applications: network-manager: Neutron nova-compute: constraints: mem=10240M - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 4 options: openstack-origin: distro debug: True hacluster-octavia: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster num_units: 0 octavia: constraints: cores=8 @@ -174,25 +174,25 @@ applications: loadbalancer-topology: 'ACTIVE_STANDBY' vip: 'ADD YOUR VIP HERE' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 glance-simplestreams-sync: - charm: cs:~openstack-charmers-next/glance-simplestreams-sync + charm: cs:~openstack-charmers/glance-simplestreams-sync num_units: 1 options: use_swift: False octavia-diskimage-retrofit: - charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit + charm: cs:~openstack-charmers/octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' retrofit-series: groovy placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: openstack-origin: distro debug: true vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index d8d11db5..8ba29113 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -15,6 +15,6 @@ pytest-runner # LP: #1862186 zipp < 2.0.0 -git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack +git+https://opendev.org/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack -git+https://github.com/juju/charm-helpers.git#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git@stable/21.01#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 3f085244..7765d0ea 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6' nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack # # Revisit for removal / mock improvement: netifaces # vault