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: I1b140bdac20cfa262eea4e1974409e0f2a08be51
This commit is contained in:
parent
1e42ff4c36
commit
dd4f682341
|
@ -2,3 +2,5 @@
|
|||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-manila.git
|
||||
|
||||
defaultbranch=stable/21.01
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -7,17 +7,17 @@ services:
|
|||
options:
|
||||
default-share-backend: generic
|
||||
manila-generic:
|
||||
charm: cs:~openstack-charmers-next/manila-generic
|
||||
charm: cs:~openstack-charmers/manila-generic
|
||||
options:
|
||||
driver-handles-share-servers: False
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
|
||||
relations:
|
||||
|
|
|
@ -4,23 +4,23 @@ options:
|
|||
services:
|
||||
manila-ganesha:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/manila-ganesha
|
||||
charm: cs:~openstack-charmers/manila-ganesha
|
||||
options:
|
||||
openstack-origin: *source
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *source
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *source
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
ceph-fs:
|
||||
charm: cs:~openstack-charmers-next/ceph-fs
|
||||
charm: cs:~openstack-charmers/ceph-fs
|
||||
num_units: 2
|
||||
options:
|
||||
source: *source
|
||||
|
@ -33,13 +33,13 @@ services:
|
|||
default-share-backend: cephfsnfs1
|
||||
share-protocols: NFS
|
||||
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
|
||||
openstack-origin: *source
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
constraints: mem=8G
|
||||
options:
|
||||
|
@ -49,37 +49,37 @@ services:
|
|||
migration-auth-type: ssh
|
||||
openstack-origin: *source
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
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
|
||||
openstack-origin: *source
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||
charm: cs:~openstack-charmers/neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
openstack-origin: *source
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
|
|
|
@ -4,23 +4,23 @@ options:
|
|||
services:
|
||||
manila-ganesha:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/manila-ganesha
|
||||
charm: cs:~openstack-charmers/manila-ganesha
|
||||
options:
|
||||
openstack-origin: *source
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *source
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *source
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
ceph-fs:
|
||||
charm: cs:~openstack-charmers-next/ceph-fs
|
||||
charm: cs:~openstack-charmers/ceph-fs
|
||||
num_units: 2
|
||||
options:
|
||||
source: *source
|
||||
|
@ -33,13 +33,13 @@ services:
|
|||
default-share-backend: cephfsnfs1
|
||||
share-protocols: NFS
|
||||
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
|
||||
openstack-origin: *source
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
constraints: mem=8G
|
||||
options:
|
||||
|
@ -49,37 +49,37 @@ services:
|
|||
migration-auth-type: ssh
|
||||
openstack-origin: *source
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
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
|
||||
openstack-origin: *source
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||
charm: cs:~openstack-charmers/neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
openstack-origin: *source
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
|
|
|
@ -4,23 +4,23 @@ variables:
|
|||
services:
|
||||
manila-ganesha:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/manila-ganesha
|
||||
charm: cs:~openstack-charmers/manila-ganesha
|
||||
options:
|
||||
openstack-origin: *source
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *source
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *source
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
ceph-fs:
|
||||
charm: cs:~openstack-charmers-next/ceph-fs
|
||||
charm: cs:~openstack-charmers/ceph-fs
|
||||
num_units: 2
|
||||
options:
|
||||
source: *source
|
||||
|
@ -33,13 +33,13 @@ services:
|
|||
default-share-backend: cephfsnfs1
|
||||
share-protocols: NFS
|
||||
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
|
||||
openstack-origin: *source
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
constraints: mem=8G
|
||||
options:
|
||||
|
@ -49,42 +49,42 @@ services:
|
|||
migration-auth-type: ssh
|
||||
openstack-origin: *source
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
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
|
||||
openstack-origin: *source
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||
charm: cs:~openstack-charmers/neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
openstack-origin: *source
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 3
|
||||
options:
|
||||
openstack-origin: *source
|
||||
|
|
|
@ -4,23 +4,23 @@ variables:
|
|||
services:
|
||||
manila-ganesha:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/manila-ganesha
|
||||
charm: cs:~openstack-charmers/manila-ganesha
|
||||
options:
|
||||
openstack-origin: *source
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *source
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *source
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
ceph-fs:
|
||||
charm: cs:~openstack-charmers-next/ceph-fs
|
||||
charm: cs:~openstack-charmers/ceph-fs
|
||||
num_units: 2
|
||||
options:
|
||||
source: *source
|
||||
|
@ -33,13 +33,13 @@ services:
|
|||
default-share-backend: cephfsnfs1
|
||||
share-protocols: NFS
|
||||
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
|
||||
openstack-origin: *source
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
constraints: mem=8G
|
||||
options:
|
||||
|
@ -49,12 +49,12 @@ services:
|
|||
migration-auth-type: ssh
|
||||
openstack-origin: *source
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
|
@ -63,30 +63,30 @@ services:
|
|||
neutron-security-groups: true
|
||||
openstack-origin: *source
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
neutron-gateway:
|
||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||
charm: cs:~openstack-charmers/neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
openstack-origin: *source
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
|
|
|
@ -40,22 +40,22 @@ machines:
|
|||
services:
|
||||
|
||||
manila-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
manila-ganesha-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
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
|
||||
nova-cloud-controller-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
|
||||
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
|
||||
|
@ -66,14 +66,14 @@ services:
|
|||
|
||||
manila-ganesha:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/manila-ganesha
|
||||
charm: cs:~openstack-charmers/manila-ganesha
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -83,7 +83,7 @@ services:
|
|||
- '6'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -95,7 +95,7 @@ services:
|
|||
- '9'
|
||||
|
||||
ceph-fs:
|
||||
charm: cs:~openstack-charmers-next/ceph-fs
|
||||
charm: cs:~openstack-charmers/ceph-fs
|
||||
num_units: 2
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -116,7 +116,7 @@ services:
|
|||
- '14'
|
||||
|
||||
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
|
||||
|
@ -125,7 +125,7 @@ services:
|
|||
- '15'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
storage:
|
||||
ephemeral-device: '40G'
|
||||
|
@ -140,7 +140,7 @@ services:
|
|||
- '17'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -148,7 +148,7 @@ services:
|
|||
- '18'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
|
@ -160,10 +160,10 @@ services:
|
|||
- '19'
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
|
||||
neutron-gateway:
|
||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||
charm: cs:~openstack-charmers/neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
|
@ -172,7 +172,7 @@ services:
|
|||
- '20'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -180,7 +180,7 @@ services:
|
|||
- '21'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -188,7 +188,7 @@ services:
|
|||
- '22'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -40,22 +40,22 @@ machines:
|
|||
services:
|
||||
|
||||
manila-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
manila-ganesha-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
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
|
||||
nova-cloud-controller-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
|
||||
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
|
||||
|
@ -66,14 +66,14 @@ services:
|
|||
|
||||
manila-ganesha:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/manila-ganesha
|
||||
charm: cs:~openstack-charmers/manila-ganesha
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -83,7 +83,7 @@ services:
|
|||
- '6'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -95,7 +95,7 @@ services:
|
|||
- '9'
|
||||
|
||||
ceph-fs:
|
||||
charm: cs:~openstack-charmers-next/ceph-fs
|
||||
charm: cs:~openstack-charmers/ceph-fs
|
||||
num_units: 2
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -116,7 +116,7 @@ services:
|
|||
- '14'
|
||||
|
||||
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
|
||||
|
@ -125,7 +125,7 @@ services:
|
|||
- '15'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
storage:
|
||||
ephemeral-device: '40G'
|
||||
|
@ -140,7 +140,7 @@ services:
|
|||
- '17'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -148,7 +148,7 @@ services:
|
|||
- '18'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
|
@ -160,10 +160,10 @@ services:
|
|||
- '19'
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
|
||||
neutron-gateway:
|
||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||
charm: cs:~openstack-charmers/neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
|
@ -172,7 +172,7 @@ services:
|
|||
- '20'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -180,7 +180,7 @@ services:
|
|||
- '21'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -188,7 +188,7 @@ services:
|
|||
- '22'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -40,22 +40,22 @@ machines:
|
|||
services:
|
||||
|
||||
manila-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
manila-ganesha-mysql-router:
|
||||
charm: cs:~openstack-charmers-next/mysql-router
|
||||
charm: cs:~openstack-charmers/mysql-router
|
||||
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
|
||||
nova-cloud-controller-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
|
||||
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
|
||||
|
@ -66,14 +66,14 @@ services:
|
|||
|
||||
manila-ganesha:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/manila-ganesha
|
||||
charm: cs:~openstack-charmers/manila-ganesha
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
|
||||
ceph-mon:
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
charm: cs:~openstack-charmers/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -83,7 +83,7 @@ services:
|
|||
- '6'
|
||||
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
charm: cs:~openstack-charmers/ceph-osd
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -95,7 +95,7 @@ services:
|
|||
- '9'
|
||||
|
||||
ceph-fs:
|
||||
charm: cs:~openstack-charmers-next/ceph-fs
|
||||
charm: cs:~openstack-charmers/ceph-fs
|
||||
num_units: 2
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -116,7 +116,7 @@ services:
|
|||
- '14'
|
||||
|
||||
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
|
||||
|
@ -125,7 +125,7 @@ services:
|
|||
- '15'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 2
|
||||
storage:
|
||||
ephemeral-device: '40G'
|
||||
|
@ -140,7 +140,7 @@ services:
|
|||
- '17'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -148,7 +148,7 @@ services:
|
|||
- '18'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
|
@ -160,10 +160,10 @@ services:
|
|||
- '19'
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: cs:~openstack-charmers-next/neutron-openvswitch
|
||||
charm: cs:~openstack-charmers/neutron-openvswitch
|
||||
|
||||
neutron-gateway:
|
||||
charm: cs:~openstack-charmers-next/neutron-gateway
|
||||
charm: cs:~openstack-charmers/neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
bridge-mappings: physnet1:br-ex
|
||||
|
@ -172,7 +172,7 @@ services:
|
|||
- '20'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -180,7 +180,7 @@ services:
|
|||
- '21'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
|
@ -188,7 +188,7 @@ services:
|
|||
- '22'
|
||||
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
charm: cs:~openstack-charmers/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
|
|
@ -4,7 +4,7 @@ applications:
|
|||
options:
|
||||
vip: '{{ OS_VIP00 }}'
|
||||
hacluster:
|
||||
charm: cs:~openstack-charmers-next/hacluster
|
||||
charm: cs:~openstack-charmers/hacluster
|
||||
num_units: 0
|
||||
relations:
|
||||
- - manila
|
||||
|
|
|
@ -10,21 +10,21 @@ services:
|
|||
default-share-backend: generic
|
||||
openstack-origin: *source
|
||||
manila-generic:
|
||||
charm: cs:~openstack-charmers-next/manila-generic
|
||||
charm: cs:~openstack-charmers/manila-generic
|
||||
options:
|
||||
driver-handles-share-servers: False
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
|
|
|
@ -10,21 +10,21 @@ services:
|
|||
default-share-backend: generic
|
||||
openstack-origin: *source
|
||||
manila-generic:
|
||||
charm: cs:~openstack-charmers-next/manila-generic
|
||||
charm: cs:~openstack-charmers/manila-generic
|
||||
options:
|
||||
driver-handles-share-servers: False
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
|
|
|
@ -10,21 +10,21 @@ services:
|
|||
default-share-backend: generic
|
||||
openstack-origin: *source
|
||||
manila-generic:
|
||||
charm: cs:~openstack-charmers-next/manila-generic
|
||||
charm: cs:~openstack-charmers/manila-generic
|
||||
options:
|
||||
driver-handles-share-servers: False
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
|
|
|
@ -10,21 +10,21 @@ services:
|
|||
default-share-backend: generic
|
||||
openstack-origin: *source
|
||||
manila-generic:
|
||||
charm: cs:~openstack-charmers-next/manila-generic
|
||||
charm: cs:~openstack-charmers/manila-generic
|
||||
options:
|
||||
driver-handles-share-servers: False
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
source: *source
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *source
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
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
|
||||
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…
Reference in New Issue