From 1f0952d8a0e69b616ab4238523bb39fcf45ed4f8 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Mon, 3 May 2021 12:30:02 +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: I678bc434ac74fc9d73cf871683d185ab2fb62c2b --- .gitreview | 2 ++ tests/bundles/bionic-queens.yaml | 16 +++++++-------- tests/bundles/bionic-rocky.yaml | 16 +++++++-------- tests/bundles/bionic-stein.yaml | 16 +++++++-------- tests/bundles/bionic-train.yaml | 18 ++++++++--------- tests/bundles/bionic-ussuri.yaml | 18 ++++++++--------- tests/bundles/focal-ussuri.yaml | 32 +++++++++++++++--------------- tests/bundles/focal-victoria.yaml | 32 +++++++++++++++--------------- tests/bundles/groovy-victoria.yaml | 32 +++++++++++++++--------------- tests/bundles/xenial-mitaka.yaml | 16 +++++++-------- tests/bundles/xenial-ocata.yaml | 16 +++++++-------- tests/bundles/xenial-pike.yaml | 16 +++++++-------- tests/bundles/xenial-queens.yaml | 16 +++++++-------- 13 files changed, 124 insertions(+), 122 deletions(-) diff --git a/.gitreview b/.gitreview index 6325d78c..503086f7 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-nova-cloud-controller.git + +defaultbranch=stable/21.04 diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index 475c6bcb..e957ffce 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -40,10 +40,10 @@ relations: - neutron-openvswitch:amqp applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -61,26 +61,26 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index 657e9ce0..8ddfbf20 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -40,10 +40,10 @@ relations: - neutron-openvswitch:amqp applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -62,32 +62,32 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-rocky flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-rocky bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index 1b93aa41..499ab1b7 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -40,10 +40,10 @@ relations: - neutron-openvswitch:amqp applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -62,32 +62,32 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-stein flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-stein neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-stein bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-stein neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index edcde46a..54026307 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -46,10 +46,10 @@ relations: - nova-cloud-controller:placement applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -68,37 +68,37 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:bionic-train flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-train bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:bionic-train nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index c0b7f7b2..08f35655 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -46,10 +46,10 @@ relations: - nova-cloud-controller:placement applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -68,7 +68,7 @@ applications: vendor-data-url: http://some.url/vdata debug: true 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 @@ -77,30 +77,30 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-ussuri bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:bionic-ussuri nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 929bb7f2..854a6a4a 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -30,20 +30,20 @@ machines: applications: nova-cloud-controller-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 glance-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 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: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -55,7 +55,7 @@ applications: - '2' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' @@ -74,7 +74,7 @@ applications: - '4' 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 @@ -86,7 +86,7 @@ applications: - '5' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -94,7 +94,7 @@ applications: - '6' neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin @@ -103,7 +103,7 @@ applications: - '7' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -111,10 +111,10 @@ applications: - '8' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin @@ -122,7 +122,7 @@ applications: - '9' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 storage: ephemeral-device: '40G' @@ -137,7 +137,7 @@ applications: - '11' vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index 38469a5c..a18339f1 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -30,20 +30,20 @@ machines: applications: nova-cloud-controller-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 glance-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 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: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -55,7 +55,7 @@ applications: - '2' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' @@ -74,7 +74,7 @@ applications: - '4' 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 @@ -86,7 +86,7 @@ applications: - '5' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -94,7 +94,7 @@ applications: - '6' neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin @@ -103,7 +103,7 @@ applications: - '7' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -111,10 +111,10 @@ applications: - '8' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin @@ -122,7 +122,7 @@ applications: - '9' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 storage: ephemeral-device: '40G' @@ -137,7 +137,7 @@ applications: - '11' vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index ed8433a4..10208f14 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -30,20 +30,20 @@ machines: applications: nova-cloud-controller-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 glance-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 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: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -55,7 +55,7 @@ applications: - '2' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 to: - '3' @@ -74,7 +74,7 @@ applications: - '4' 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 @@ -86,7 +86,7 @@ applications: - '5' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -94,7 +94,7 @@ applications: - '6' neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin @@ -103,7 +103,7 @@ applications: - '7' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -111,10 +111,10 @@ applications: - '8' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin @@ -122,7 +122,7 @@ applications: - '9' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 storage: ephemeral-device: '40G' @@ -137,7 +137,7 @@ applications: - '11' vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '12' diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index cfc7e211..8e32bb19 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -40,10 +40,10 @@ relations: - neutron-openvswitch:amqp applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -59,26 +59,26 @@ applications: network-manager: Neutron debug: true neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index 31789834..7ecad271 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -40,10 +40,10 @@ relations: - neutron-openvswitch:amqp applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -62,32 +62,32 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:xenial-ocata flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-ocata neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:xenial-ocata bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-ocata neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index f5404d66..c2b3c109 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -40,10 +40,10 @@ relations: - neutron-openvswitch:amqp applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -62,32 +62,32 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:xenial-pike flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-pike neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:xenial-pike bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-pike neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index d68c56ed..7881a701 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -40,10 +40,10 @@ relations: - neutron-openvswitch:amqp applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 @@ -62,32 +62,32 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: cloud:xenial-queens flat-network-providers: physnet1 neutron-security-groups: true keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-queens neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: cloud:xenial-queens bridge-mappings: physnet1:br-ex glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-queens neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=4G cores=4 options: