Browse Source

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: I0ce661a51c085dafcf1291eb46dcd56997ad1416
changes/80/691080/1
David Ames 3 years ago
parent
commit
5779b2e3cd
  1. 2
      .gitreview
  2. 1
      src/tests/bundles/bionic-queens-ha.yaml
  3. 154
      src/tests/bundles/bionic-queens-ha.yaml
  4. 1
      src/tests/bundles/bionic-queens-smoke-ha.yaml
  5. 59
      src/tests/bundles/bionic-queens-smoke-ha.yaml
  6. 10
      src/tests/bundles/bionic-queens-smoke.yaml
  7. 24
      src/tests/bundles/bionic-queens.yaml
  8. 1
      src/tests/bundles/overlays/bionic-queens-ha.yaml.j2
  9. 26
      src/tests/bundles/overlays/bionic-queens-ha.yaml.j2
  10. 1
      src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2
  11. 26
      src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2
  12. 4
      src/tests/bundles/overlays/ha.yaml.j2
  13. 2
      src/wheelhouse.txt

2
.gitreview

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

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

@ -1 +0,0 @@
bionic-queens.yaml

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

@ -0,0 +1,154 @@
relations:
- - nova-compute:amqp
- rabbitmq-server:amqp
- - neutron-gateway:amqp
- rabbitmq-server:amqp
- - keystone:shared-db
- mysql:shared-db
- - nova-cloud-controller:identity-service
- keystone:identity-service
- - glance:identity-service
- keystone:identity-service
- - neutron-api:identity-service
- keystone:identity-service
- - neutron-openvswitch:neutron-plugin-api
- neutron-api:neutron-plugin-api
- - neutron-api:shared-db
- mysql:shared-db
- - neutron-api:amqp
- rabbitmq-server:amqp
- - neutron-gateway:neutron-plugin-api
- neutron-api:neutron-plugin-api
- - glance:shared-db
- mysql:shared-db
- - glance:amqp
- rabbitmq-server:amqp
- - nova-cloud-controller:image-service
- glance:image-service
- - nova-compute:image-service
- glance:image-service
- - nova-cloud-controller:cloud-compute
- nova-compute:cloud-compute
- - nova-cloud-controller:amqp
- rabbitmq-server:amqp
- - nova-cloud-controller:quantum-network-service
- neutron-gateway:quantum-network-service
- - nova-compute:neutron-plugin
- neutron-openvswitch:neutron-plugin
- - neutron-openvswitch:amqp
- rabbitmq-server:amqp
- - openstack-dashboard:identity-service
- keystone:identity-service
- - openstack-dashboard:shared-db
- mysql:shared-db
- - nova-cloud-controller:shared-db
- mysql:shared-db
- - nova-cloud-controller:neutron-api
- neutron-api:neutron-api
- - cinder:image-service
- glance:image-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:identity-service
- keystone:identity-service
- - cinder:cinder-volume-service
- nova-cloud-controller:cinder-volume-service
- - cinder:shared-db
- mysql:shared-db
- - ntp:juju-info
- nova-compute:juju-info
- - ntp:juju-info
- neutron-gateway:juju-info
- - keystone
- keystone-saml-mellon
- - vault:shared-db
- mysql:shared-db
- - vault:certificates
- keystone:certificates
- - vault:certificates
- glance:certificates
- - vault:certificates
- openstack-dashboard:certificates
- - openstack-dashboard
- keystone-saml-mellon
- - keystone:websso-trusted-dashboard
- openstack-dashboard:websso-trusted-dashboard
- - vault:certificates
- cinder:certificates
- - vault:certificates
- neutron-api:certificates
- - vault:certificates
- nova-cloud-controller:certificates
series: bionic
services:
cinder:
charm: cs:cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
glance:
charm: cs:glance
num_units: 1
keystone:
charm: cs:keystone
num_units: 1
options:
token-provider: 'fernet'
mysql:
charm: cs:percona-cluster
num_units: 1
constraints: mem=3072M
options:
innodb-buffer-pool-size: 256M
max-connections: 1000
neutron-api:
charm: cs:neutron-api
num_units: 1
options:
flat-network-providers: physnet1
neutron-security-groups: true
neutron-gateway:
charm: cs:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:neutron-openvswitch
num_units: 0
nova-cloud-controller:
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
nova-compute:
charm: cs:nova-compute
num_units: 2
options:
config-flags: default_ephemeral_format=ext4
enable-live-migration: true
enable-resize: true
migration-auth-type: ssh
ntp:
charm: cs:ntp
num_units: 0
openstack-dashboard:
charm: cs:openstack-dashboard
num_units: 1
rabbitmq-server:
charm: cs:rabbitmq-server
num_units: 1
vault:
num_units: 1
charm: cs:vault
keystone-saml-mellon:
series: bionic
charm: ../../../keystone-saml-mellon
num_units: 0
options:
idp-name: 'samltest'
protocol-name: 'mapped'
user-facing-name: "samltest.id"
subject-confirmation-data-address-check: False
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"

1
src/tests/bundles/bionic-queens-smoke-ha.yaml

@ -1 +0,0 @@
bionic-queens-smoke.yaml

59
src/tests/bundles/bionic-queens-smoke-ha.yaml

@ -0,0 +1,59 @@
series: bionic
relations:
- - keystone:shared-db
- mysql:shared-db
- - glance:shared-db
- mysql:shared-db
- - glance:identity-service
- keystone:identity-service
- - keystone
- keystone-saml-mellon
- - vault:shared-db
- mysql:shared-db
- - vault:certificates
- keystone:certificates
- - vault:certificates
- glance:certificates
- - vault:certificates
- openstack-dashboard:certificates
- - openstack-dashboard
- keystone-saml-mellon
- - keystone:websso-trusted-dashboard
- openstack-dashboard:websso-trusted-dashboard
- - openstack-dashboard:identity-service
- keystone:identity-service
applications:
mysql:
constraints: mem=3072M
charm: cs:percona-cluster
num_units: 1
keystone:
series: bionic
charm: cs:keystone
num_units: 1
options:
token-provider: 'fernet'
token-expiration: 60
keystone-saml-mellon:
series: bionic
charm: ../../../keystone-saml-mellon
num_units: 0
options:
idp-name: 'samltest'
protocol-name: 'mapped'
user-facing-name: "samltest.id"
subject-confirmation-data-address-check: False
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
resources:
idp-metadata: "./idp-metadata.xml"
sp-signing-keyinfo: "./sp-signing-keyinfo.xml"
sp-private-key: "./sp-private-key.pem"
glance:
charm: cs:glance
num_units: 1
vault:
num_units: 1
charm: cs:vault
openstack-dashboard:
num_units: 1
charm: cs:openstack-dashboard

10
src/tests/bundles/bionic-queens-smoke.yaml

@ -25,11 +25,11 @@ relations:
applications:
mysql:
constraints: mem=3072M
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:percona-cluster
num_units: 1
keystone:
series: bionic
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
token-provider: 'fernet'
@ -49,11 +49,11 @@ applications:
sp-signing-keyinfo: "./sp-signing-keyinfo.xml"
sp-private-key: "./sp-private-key.pem"
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
charm: cs:vault
openstack-dashboard:
num_units: 1
charm: cs:~openstack-charmers-next/openstack-dashboard
charm: cs:openstack-dashboard

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

@ -83,47 +83,47 @@ relations:
series: bionic
services:
cinder:
charm: cs:~openstack-charmers-next/cinder
charm: cs:cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:glance
num_units: 1
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:keystone
num_units: 1
options:
token-provider: 'fernet'
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs: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: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:neutron-gateway
num_units: 1
options:
bridge-mappings: physnet1:br-ex
neutron-openvswitch:
charm: cs:~openstack-charmers-next/neutron-openvswitch
charm: cs:neutron-openvswitch
num_units: 0
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:nova-cloud-controller
num_units: 1
options:
network-manager: Neutron
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs: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-dashboard
num_units: 1
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:rabbitmq-server
num_units: 1
vault:
num_units: 1
charm: cs:~openstack-charmers-next/vault
charm: cs:vault
keystone-saml-mellon:
series: bionic
charm: ../../../keystone-saml-mellon

1
src/tests/bundles/overlays/bionic-queens-ha.yaml.j2

@ -1 +0,0 @@
ha.yaml.j2

26
src/tests/bundles/overlays/bionic-queens-ha.yaml.j2

@ -0,0 +1,26 @@
relations:
- - keystone
- keystone-hacluster
- - openstack-dashboard
- openstack-dashboard-hacluster
applications:
keystone:
num_units: 3
options:
vip: {{ OS_VIP00 }}
openstack-dashboard:
num_units: 3
options:
vip: {{ OS_VIP01 }}
keystone-hacluster:
charm: cs:hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
openstack-dashboard-hacluster:
charm: cs:hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3

1
src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2

@ -1 +0,0 @@
ha.yaml.j2

26
src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2

@ -0,0 +1,26 @@
relations:
- - keystone
- keystone-hacluster
- - openstack-dashboard
- openstack-dashboard-hacluster
applications:
keystone:
num_units: 3
options:
vip: {{ OS_VIP00 }}
openstack-dashboard:
num_units: 3
options:
vip: {{ OS_VIP01 }}
keystone-hacluster:
charm: cs:hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3
openstack-dashboard-hacluster:
charm: cs:hacluster
num_units: 0
options:
corosync_transport: unicast
cluster_count: 3

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

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

2
src/wheelhouse.txt

@ -3,3 +3,5 @@ lxml
jinja2
psutil
git+https://opendev.org/openstack/charms.openstack.git@stable/19.10#egg=charms.openstack

Loading…
Cancel
Save