Updates for stable branch creation
Set default branch for git review/gerrit. Update test bundles to point to openstack-charmers. Change-Id: Ice3086f74e5ad7e807317560576fe1d420a3c1c2
This commit is contained in:
parent
f86db02b7e
commit
1304e375af
|
@ -2,3 +2,5 @@
|
|||
host=review.openstack.org
|
||||
port=29418
|
||||
project=openstack/charm-keystone-saml-mellon.git
|
||||
|
||||
defaultbranch=stable/21.04
|
||||
|
|
|
@ -87,47 +87,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
|
||||
|
@ -138,14 +138,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-mellon1:
|
||||
series: bionic
|
||||
charm: ../../../keystone-saml-mellon
|
||||
|
|
|
@ -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
|
||||
|
@ -208,13 +208,13 @@ applications:
|
|||
auth-user-password: 'userpass2'
|
||||
|
||||
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
|
||||
|
|
|
@ -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
|
||||
|
@ -208,13 +208,13 @@ applications:
|
|||
auth-user-password: 'userpass2'
|
||||
|
||||
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
|
||||
|
|
|
@ -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
|
||||
|
@ -208,13 +208,13 @@ applications:
|
|||
auth-user-password: 'userpass2'
|
||||
|
||||
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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue