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
This commit is contained in:
parent
a408b53adc
commit
1c04ac21a8
|
@ -2,3 +2,5 @@
|
||||||
host=review.openstack.org
|
host=review.openstack.org
|
||||||
port=29418
|
port=29418
|
||||||
project=openstack/charm-keystone-saml-mellon.git
|
project=openstack/charm-keystone-saml-mellon.git
|
||||||
|
|
||||||
|
defaultbranch=stable/21.01
|
||||||
|
|
|
@ -11,5 +11,5 @@ charm-tools>=2.4.4
|
||||||
keyring<21
|
keyring<21
|
||||||
|
|
||||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
# 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.git@stable/21.01#egg=zaza
|
||||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack
|
||||||
|
|
|
@ -83,47 +83,47 @@ relations:
|
||||||
series: bionic
|
series: bionic
|
||||||
services:
|
services:
|
||||||
cinder:
|
cinder:
|
||||||
charm: cs:~openstack-charmers-next/cinder
|
charm: cs:~openstack-charmers/cinder
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
block-device: None
|
block-device: None
|
||||||
glance-api-version: 2
|
glance-api-version: 2
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers-next/glance
|
charm: cs:~openstack-charmers/glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
token-provider: 'fernet'
|
token-provider: 'fernet'
|
||||||
mysql:
|
mysql:
|
||||||
charm: cs:~openstack-charmers-next/percona-cluster
|
charm: cs:~openstack-charmers/percona-cluster
|
||||||
num_units: 1
|
num_units: 1
|
||||||
constraints: mem=3072M
|
constraints: mem=3072M
|
||||||
options:
|
options:
|
||||||
innodb-buffer-pool-size: 256M
|
innodb-buffer-pool-size: 256M
|
||||||
max-connections: 1000
|
max-connections: 1000
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
charm: cs:~openstack-charmers/neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
flat-network-providers: physnet1
|
flat-network-providers: physnet1
|
||||||
neutron-security-groups: true
|
neutron-security-groups: true
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
charm: cs:~openstack-charmers/neutron-gateway
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
bridge-mappings: physnet1:br-ex
|
bridge-mappings: physnet1:br-ex
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
network-manager: Neutron
|
network-manager: Neutron
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers/nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
config-flags: default_ephemeral_format=ext4
|
config-flags: default_ephemeral_format=ext4
|
||||||
|
@ -134,14 +134,14 @@ services:
|
||||||
charm: cs:ntp
|
charm: cs:ntp
|
||||||
num_units: 0
|
num_units: 0
|
||||||
openstack-dashboard:
|
openstack-dashboard:
|
||||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
charm: cs:~openstack-charmers/openstack-dashboard
|
||||||
num_units: 1
|
num_units: 1
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
vault:
|
vault:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
keystone-saml-mellon:
|
keystone-saml-mellon:
|
||||||
series: bionic
|
series: bionic
|
||||||
charm: ../../../keystone-saml-mellon
|
charm: ../../../keystone-saml-mellon
|
||||||
|
|
|
@ -32,24 +32,24 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
neutron-api-mysql-router:
|
neutron-api-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
openstack-dashboard-mysql-router:
|
openstack-dashboard-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
nova-cloud-controller-mysql-router:
|
nova-cloud-controller-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -60,7 +60,7 @@ applications:
|
||||||
|
|
||||||
cinder:
|
cinder:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers-next/cinder
|
charm: cs:~openstack-charmers/cinder
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
glance-api-version: 2
|
glance-api-version: 2
|
||||||
|
@ -69,7 +69,7 @@ applications:
|
||||||
- '3'
|
- '3'
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers-next/glance
|
charm: cs:~openstack-charmers/glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -77,7 +77,7 @@ applications:
|
||||||
- '4'
|
- '4'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -88,7 +88,7 @@ applications:
|
||||||
- '7'
|
- '7'
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
charm: cs:~openstack-charmers/neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -99,7 +99,7 @@ applications:
|
||||||
- '8'
|
- '8'
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
charm: cs:~openstack-charmers/neutron-gateway
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -108,11 +108,11 @@ applications:
|
||||||
- '9'
|
- '9'
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -121,7 +121,7 @@ applications:
|
||||||
- '10'
|
- '10'
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers/nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -138,7 +138,7 @@ applications:
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
openstack-dashboard:
|
openstack-dashboard:
|
||||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
charm: cs:~openstack-charmers/openstack-dashboard
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -148,7 +148,7 @@ applications:
|
||||||
- '15'
|
- '15'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -157,12 +157,12 @@ applications:
|
||||||
|
|
||||||
vault:
|
vault:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
to:
|
to:
|
||||||
- '17'
|
- '17'
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers-next/placement
|
charm: cs:~openstack-charmers/placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -181,13 +181,13 @@ applications:
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
||||||
|
|
||||||
keystone-hacluster:
|
keystone-hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:~openstack-charmers/hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
openstack-dashboard-hacluster:
|
openstack-dashboard-hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:~openstack-charmers/hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
|
|
|
@ -32,24 +32,24 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
neutron-api-mysql-router:
|
neutron-api-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
openstack-dashboard-mysql-router:
|
openstack-dashboard-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
nova-cloud-controller-mysql-router:
|
nova-cloud-controller-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -60,7 +60,7 @@ applications:
|
||||||
|
|
||||||
cinder:
|
cinder:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers-next/cinder
|
charm: cs:~openstack-charmers/cinder
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
glance-api-version: 2
|
glance-api-version: 2
|
||||||
|
@ -69,7 +69,7 @@ applications:
|
||||||
- '3'
|
- '3'
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers-next/glance
|
charm: cs:~openstack-charmers/glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -77,7 +77,7 @@ applications:
|
||||||
- '4'
|
- '4'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -88,7 +88,7 @@ applications:
|
||||||
- '7'
|
- '7'
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
charm: cs:~openstack-charmers/neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -99,7 +99,7 @@ applications:
|
||||||
- '8'
|
- '8'
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
charm: cs:~openstack-charmers/neutron-gateway
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -108,11 +108,11 @@ applications:
|
||||||
- '9'
|
- '9'
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -121,7 +121,7 @@ applications:
|
||||||
- '10'
|
- '10'
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers/nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -138,7 +138,7 @@ applications:
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
openstack-dashboard:
|
openstack-dashboard:
|
||||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
charm: cs:~openstack-charmers/openstack-dashboard
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -148,7 +148,7 @@ applications:
|
||||||
- '15'
|
- '15'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -157,12 +157,12 @@ applications:
|
||||||
|
|
||||||
vault:
|
vault:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
to:
|
to:
|
||||||
- '17'
|
- '17'
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers-next/placement
|
charm: cs:~openstack-charmers/placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -181,13 +181,13 @@ applications:
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
||||||
|
|
||||||
keystone-hacluster:
|
keystone-hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:~openstack-charmers/hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
openstack-dashboard-hacluster:
|
openstack-dashboard-hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:~openstack-charmers/hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
|
|
|
@ -32,24 +32,24 @@ machines:
|
||||||
applications:
|
applications:
|
||||||
|
|
||||||
keystone-mysql-router:
|
keystone-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
neutron-api-mysql-router:
|
neutron-api-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
glance-mysql-router:
|
glance-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
openstack-dashboard-mysql-router:
|
openstack-dashboard-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
nova-cloud-controller-mysql-router:
|
nova-cloud-controller-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
cinder-mysql-router:
|
cinder-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
vault-mysql-router:
|
vault-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
placement-mysql-router:
|
placement-mysql-router:
|
||||||
charm: cs:~openstack-charmers-next/mysql-router
|
charm: cs:~openstack-charmers/mysql-router
|
||||||
|
|
||||||
mysql-innodb-cluster:
|
mysql-innodb-cluster:
|
||||||
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
|
charm: cs:~openstack-charmers/mysql-innodb-cluster
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -60,7 +60,7 @@ applications:
|
||||||
|
|
||||||
cinder:
|
cinder:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers-next/cinder
|
charm: cs:~openstack-charmers/cinder
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
glance-api-version: 2
|
glance-api-version: 2
|
||||||
|
@ -69,7 +69,7 @@ applications:
|
||||||
- '3'
|
- '3'
|
||||||
|
|
||||||
glance:
|
glance:
|
||||||
charm: cs:~openstack-charmers-next/glance
|
charm: cs:~openstack-charmers/glance
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -77,7 +77,7 @@ applications:
|
||||||
- '4'
|
- '4'
|
||||||
|
|
||||||
keystone:
|
keystone:
|
||||||
charm: cs:~openstack-charmers-next/keystone
|
charm: cs:~openstack-charmers/keystone
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -88,7 +88,7 @@ applications:
|
||||||
- '7'
|
- '7'
|
||||||
|
|
||||||
neutron-api:
|
neutron-api:
|
||||||
charm: cs:~openstack-charmers-next/neutron-api
|
charm: cs:~openstack-charmers/neutron-api
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -99,7 +99,7 @@ applications:
|
||||||
- '8'
|
- '8'
|
||||||
|
|
||||||
neutron-gateway:
|
neutron-gateway:
|
||||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
charm: cs:~openstack-charmers/neutron-gateway
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -108,11 +108,11 @@ applications:
|
||||||
- '9'
|
- '9'
|
||||||
|
|
||||||
neutron-openvswitch:
|
neutron-openvswitch:
|
||||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
nova-cloud-controller:
|
nova-cloud-controller:
|
||||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
charm: cs:~openstack-charmers/nova-cloud-controller
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -121,7 +121,7 @@ applications:
|
||||||
- '10'
|
- '10'
|
||||||
|
|
||||||
nova-compute:
|
nova-compute:
|
||||||
charm: cs:~openstack-charmers-next/nova-compute
|
charm: cs:~openstack-charmers/nova-compute
|
||||||
num_units: 2
|
num_units: 2
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -138,7 +138,7 @@ applications:
|
||||||
num_units: 0
|
num_units: 0
|
||||||
|
|
||||||
openstack-dashboard:
|
openstack-dashboard:
|
||||||
charm: cs:~openstack-charmers-next/openstack-dashboard
|
charm: cs:~openstack-charmers/openstack-dashboard
|
||||||
num_units: 3
|
num_units: 3
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -148,7 +148,7 @@ applications:
|
||||||
- '15'
|
- '15'
|
||||||
|
|
||||||
rabbitmq-server:
|
rabbitmq-server:
|
||||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
charm: cs:~openstack-charmers/rabbitmq-server
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
source: *openstack-origin
|
source: *openstack-origin
|
||||||
|
@ -157,12 +157,12 @@ applications:
|
||||||
|
|
||||||
vault:
|
vault:
|
||||||
num_units: 1
|
num_units: 1
|
||||||
charm: cs:~openstack-charmers-next/vault
|
charm: cs:~openstack-charmers/vault
|
||||||
to:
|
to:
|
||||||
- '17'
|
- '17'
|
||||||
|
|
||||||
placement:
|
placement:
|
||||||
charm: cs:~openstack-charmers-next/placement
|
charm: cs:~openstack-charmers/placement
|
||||||
num_units: 1
|
num_units: 1
|
||||||
options:
|
options:
|
||||||
openstack-origin: *openstack-origin
|
openstack-origin: *openstack-origin
|
||||||
|
@ -181,13 +181,13 @@ applications:
|
||||||
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
|
||||||
|
|
||||||
keystone-hacluster:
|
keystone-hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:~openstack-charmers/hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
openstack-dashboard-hacluster:
|
openstack-dashboard-hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:~openstack-charmers/hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
|
|
|
@ -13,13 +13,13 @@ applications:
|
||||||
options:
|
options:
|
||||||
vip: {{ OS_VIP01 }}
|
vip: {{ OS_VIP01 }}
|
||||||
keystone-hacluster:
|
keystone-hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:~openstack-charmers/hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
cluster_count: 3
|
cluster_count: 3
|
||||||
openstack-dashboard-hacluster:
|
openstack-dashboard-hacluster:
|
||||||
charm: cs:~openstack-charmers-next/hacluster
|
charm: cs:~openstack-charmers/hacluster
|
||||||
num_units: 0
|
num_units: 0
|
||||||
options:
|
options:
|
||||||
corosync_transport: unicast
|
corosync_transport: unicast
|
||||||
|
|
|
@ -2,6 +2,6 @@ cryptography
|
||||||
lxml
|
lxml
|
||||||
psutil
|
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
|
||||||
|
|
|
@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
|
||||||
|
|
||||||
nose>=1.3.7
|
nose>=1.3.7
|
||||||
coverage>=3.6
|
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:
|
# Revisit for removal / mock improvement:
|
||||||
netifaces # vault
|
netifaces # vault
|
||||||
|
|
Loading…
Reference in New Issue