From 515304a393735154bf3df43d24be27364691ddbe Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Mon, 3 May 2021 12:29:38 +0200 Subject: [PATCH] Updates for stable branch creation Set default branch for git review/gerrit. Update test bundles to point to openstack-charmers. Change-Id: Iacb0e93bb8301b6b6ba7a346a40f4c3e08fdca80 --- .gitreview | 2 ++ src/tests/bundles/bionic-rocky.yaml | 24 ++++++++-------- src/tests/bundles/bionic-stein.yaml | 24 ++++++++-------- src/tests/bundles/bionic-train.yaml | 26 +++++++++--------- src/tests/bundles/bionic-ussuri.yaml | 26 +++++++++--------- src/tests/bundles/focal-ussuri.yaml | 38 +++++++++++++------------- src/tests/bundles/focal-victoria.yaml | 38 +++++++++++++------------- src/tests/bundles/groovy-victoria.yaml | 38 +++++++++++++------------- 8 files changed, 109 insertions(+), 107 deletions(-) diff --git a/.gitreview b/.gitreview index f9558a7..9c08ee0 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-nova-cell-controller.git + +defaultbranch=stable/21.04 diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index 4e5d1f9..ae4c724 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -62,32 +62,32 @@ relations: - neutron-gateway:juju-info applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 mysql-cell2: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 @@ -95,17 +95,17 @@ applications: openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-rocky worker-multiplier: 0.25 neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -122,7 +122,7 @@ applications: debug: true cell-name: "cell2" nova-compute-cell2: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -136,11 +136,11 @@ applications: charm: cs:ntp-24 num_units: 0 rabbitmq-server-nova: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 rabbitmq-server-nova-cell2: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 rabbitmq-server-neutron: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index 955a208..0e6e01b 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -62,32 +62,32 @@ relations: - neutron-gateway:juju-info applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 mysql-cell2: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 @@ -95,17 +95,17 @@ applications: openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-stein worker-multiplier: 0.25 neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -122,7 +122,7 @@ applications: debug: true cell-name: "cell2" nova-compute-cell2: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -136,11 +136,11 @@ applications: charm: cs:ntp-24 num_units: 0 rabbitmq-server-nova: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 rabbitmq-server-nova-cell2: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 rabbitmq-server-neutron: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 661bae1..2ffe81e 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -70,32 +70,32 @@ relations: - placement:placement applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train worker-multiplier: 0.25 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack openstack-origin: cloud:bionic-train worker-multiplier: 0.25 mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 mysql-cell2: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 @@ -103,17 +103,17 @@ applications: openstack-origin: cloud:bionic-train worker-multiplier: 0.25 neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-train worker-multiplier: 0.25 neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -130,7 +130,7 @@ applications: debug: true cell-name: "cell2" nova-compute-cell2: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -144,16 +144,16 @@ applications: charm: cs:ntp-24 num_units: 0 rabbitmq-server-nova: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 rabbitmq-server-nova-cell2: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 rabbitmq-server-neutron: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index 024f78d..5313182 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -70,32 +70,32 @@ relations: - placement:placement applications: glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 mysql-cell2: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: innodb-buffer-pool-size: 256M max-connections: 1000 neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -105,17 +105,17 @@ applications: openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-ussuri worker-multiplier: 0.25 neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -132,7 +132,7 @@ applications: debug: true cell-name: "cell2" nova-compute-cell2: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -146,16 +146,16 @@ applications: charm: cs:ntp-24 num_units: 0 rabbitmq-server-nova: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 rabbitmq-server-nova-cell2: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 rabbitmq-server-neutron: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 constraints: mem=1G options: diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index 922a0c9..c43d4a5 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -35,22 +35,22 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-api-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 nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-cell-controller-cell2-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -60,7 +60,7 @@ applications: - '2' mysql-innodb-cluster-cell2: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -70,7 +70,7 @@ applications: - '5' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -79,7 +79,7 @@ applications: - '6' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack @@ -89,7 +89,7 @@ applications: - '7' neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -102,7 +102,7 @@ applications: - '8' neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -112,11 +112,11 @@ applications: - '9' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -138,7 +138,7 @@ applications: - '11' nova-compute-cell2: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -152,25 +152,25 @@ applications: - '12' rabbitmq-server-nova: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' rabbitmq-server-nova-cell2: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' rabbitmq-server-neutron: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index 8d6a979..d3c6d53 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -35,22 +35,22 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-api-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 nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-cell-controller-cell2-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -60,7 +60,7 @@ applications: - '2' mysql-innodb-cluster-cell2: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -70,7 +70,7 @@ applications: - '5' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -79,7 +79,7 @@ applications: - '6' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack @@ -89,7 +89,7 @@ applications: - '7' neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -102,7 +102,7 @@ applications: - '8' neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -112,11 +112,11 @@ applications: - '9' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -138,7 +138,7 @@ applications: - '11' nova-compute-cell2: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -152,25 +152,25 @@ applications: - '12' rabbitmq-server-nova: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' rabbitmq-server-nova-cell2: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' rabbitmq-server-neutron: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml index 0db128b..f619fe0 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/groovy-victoria.yaml @@ -35,22 +35,22 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router neutron-api-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 nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-cell-controller-cell2-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router options: base-port: 3316 placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -60,7 +60,7 @@ applications: - '2' mysql-innodb-cluster-cell2: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -70,7 +70,7 @@ applications: - '5' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -79,7 +79,7 @@ applications: - '6' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack @@ -89,7 +89,7 @@ applications: - '7' neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -102,7 +102,7 @@ applications: - '8' neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -112,11 +112,11 @@ applications: - '9' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch num_units: 0 nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron @@ -138,7 +138,7 @@ applications: - '11' nova-compute-cell2: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 storage: ephemeral-device: '40G' @@ -152,25 +152,25 @@ applications: - '12' rabbitmq-server-nova: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '13' rabbitmq-server-nova-cell2: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '14' rabbitmq-server-neutron: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '15' placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin