From ec4ffe1d29593d915bb70481888b4d7a93e896b4 Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 24 Oct 2019 12:28:19 -0700 Subject: [PATCH] Updates for stable branch creation Set default branch for git review/gerrit. Switch amulet tests to stable. Switch to using stable charm-helpers branch. Change-Id: I6417e3ef9cf5969b2bd2329622d7e6d5ebfdcb1c --- .gitreview | 2 ++ src/tests/bundles/bionic-train.yaml | 18 +++++++++--------- src/wheelhouse.txt | 2 ++ 3 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 src/wheelhouse.txt diff --git a/.gitreview b/.gitreview index fb8bb2a..7121350 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-placement.git + +defaultbranch=stable/19.10 diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 0dc7e48..7ec0110 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -29,51 +29,51 @@ relations: - [ placement, nova-cloud-controller ] applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:rabbitmq-server num_units: 1 constraints: mem=1G glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:glance num_units: 1 constraints: mem=1G options: openstack-origin: cloud:bionic-train keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:keystone num_units: 1 options: admin-password: openstack openstack-origin: cloud:bionic-train mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs: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:neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: cloud:bionic-train neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:neutron-openvswitch neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-train nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: cloud:bionic-train debug: true nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:nova-compute num_units: 1 constraints: mem=4G options: diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt new file mode 100644 index 0000000..8defcb8 --- /dev/null +++ b/src/wheelhouse.txt @@ -0,0 +1,2 @@ + +git+https://opendev.org/openstack/charms.openstack.git@stable/19.10#egg=charms.openstack