Browse Source

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: Ie51562cdb866546f9953a32803ec2e549726fa97
changes/64/774964/1
Aurelien Lourot 1 year ago
parent
commit
1c04ac21a8
  1. 2
      .gitreview
  2. 4
      src/test-requirements.txt
  3. 24
      src/tests/bundles/bionic-queens-ha.yaml
  4. 46
      src/tests/bundles/focal-ussuri-ha.yaml
  5. 46
      src/tests/bundles/focal-victoria-ha.yaml
  6. 46
      src/tests/bundles/groovy-victoria-ha.yaml
  7. 4
      src/tests/bundles/overlays/bionic-ha.yaml.j2
  8. 4
      src/wheelhouse.txt
  9. 2
      test-requirements.txt

2
.gitreview

@ -2,3 +2,5 @@
host=review.openstack.org
port=29418
project=openstack/charm-keystone-saml-mellon.git
defaultbranch=stable/21.01

4
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

24
src/tests/bundles/bionic-queens-ha.yaml

@ -83,47 +83,47 @@ relations:
series: bionic
services:
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
token-provider: 'fernet'
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
constraints: mem=3072M
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
neutron-security-groups: true
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
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
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
@ -134,14 +134,14 @@ services:
charm: cs:ntp
num_units: 0
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 1
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
keystone-saml-mellon:
series: bionic
charm: ../../../keystone-saml-mellon

46
src/tests/bundles/focal-ussuri-ha.yaml

@ -32,24 +32,24 @@ 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
openstack-dashboard-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
cinder-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
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:
cinder:
num_units: 1
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
options:
openstack-origin: *openstack-origin
glance-api-version: 2
@ -69,7 +69,7 @@ applications:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -77,7 +77,7 @@ applications:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 3
options:
openstack-origin: *openstack-origin
@ -88,7 +88,7 @@ applications:
- '7'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -99,7 +99,7 @@ applications:
- '8'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,11 +108,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:
openstack-origin: *openstack-origin
@ -121,7 +121,7 @@ applications:
- '10'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
openstack-origin: *openstack-origin
@ -138,7 +138,7 @@ applications:
num_units: 0
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 3
options:
openstack-origin: *openstack-origin
@ -148,7 +148,7 @@ applications:
- '15'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -157,12 +157,12 @@ applications:
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
to:
- '17'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
@ -181,13 +181,13 @@ applications:
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
keystone-hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
openstack-dashboard-hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast

46
src/tests/bundles/focal-victoria-ha.yaml

@ -32,24 +32,24 @@ 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
openstack-dashboard-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
cinder-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
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:
cinder:
num_units: 1
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
options:
openstack-origin: *openstack-origin
glance-api-version: 2
@ -69,7 +69,7 @@ applications:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -77,7 +77,7 @@ applications:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 3
options:
openstack-origin: *openstack-origin
@ -88,7 +88,7 @@ applications:
- '7'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -99,7 +99,7 @@ applications:
- '8'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,11 +108,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:
openstack-origin: *openstack-origin
@ -121,7 +121,7 @@ applications:
- '10'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
openstack-origin: *openstack-origin
@ -138,7 +138,7 @@ applications:
num_units: 0
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 3
options:
openstack-origin: *openstack-origin
@ -148,7 +148,7 @@ applications:
- '15'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -157,12 +157,12 @@ applications:
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
to:
- '17'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
@ -181,13 +181,13 @@ applications:
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
keystone-hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
openstack-dashboard-hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast

46
src/tests/bundles/groovy-victoria-ha.yaml

@ -32,24 +32,24 @@ 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
openstack-dashboard-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
cinder-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
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:
cinder:
num_units: 1
charm: cs:~openstack-charmers-next/cinder
charm: cs:~openstack-charmers/cinder
options:
openstack-origin: *openstack-origin
glance-api-version: 2
@ -69,7 +69,7 @@ applications:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -77,7 +77,7 @@ applications:
- '4'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 3
options:
openstack-origin: *openstack-origin
@ -88,7 +88,7 @@ applications:
- '7'
neutron-api:
charm: cs:~openstack-charmers-next/neutron-api
charm: cs:~openstack-charmers/neutron-api
num_units: 1
options:
openstack-origin: *openstack-origin
@ -99,7 +99,7 @@ applications:
- '8'
neutron-gateway:
charm: cs:~openstack-charmers-next/neutron-gateway
charm: cs:~openstack-charmers/neutron-gateway
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,11 +108,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:
openstack-origin: *openstack-origin
@ -121,7 +121,7 @@ applications:
- '10'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 2
options:
openstack-origin: *openstack-origin
@ -138,7 +138,7 @@ applications:
num_units: 0
openstack-dashboard:
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:~openstack-charmers/openstack-dashboard
num_units: 3
options:
openstack-origin: *openstack-origin
@ -148,7 +148,7 @@ applications:
- '15'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -157,12 +157,12 @@ applications:
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
charm: cs:~openstack-charmers/vault
to:
- '17'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
options:
openstack-origin: *openstack-origin
@ -181,13 +181,13 @@ applications:
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
keystone-hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
openstack-dashboard-hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast

4
src/tests/bundles/overlays/bionic-ha.yaml.j2

@ -13,13 +13,13 @@ applications:
options:
vip: {{ OS_VIP01 }}
keystone-hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
openstack-dashboard-hacluster:
charm: cs:~openstack-charmers-next/hacluster
charm: cs:~openstack-charmers/hacluster
num_units: 0
options:
corosync_transport: unicast

4
src/wheelhouse.txt

@ -2,6 +2,6 @@ cryptography
lxml
psutil
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

2
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

Loading…
Cancel
Save