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: Id1417a85a1dc4272d5df91b477739d58f36f4f8f
This commit is contained in:
parent
a2ead078ab
commit
4b9cc0f7ef
|
@ -2,3 +2,5 @@
|
|||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/charm-placement.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
|
||||
|
|
|
@ -41,51 +41,51 @@ relations:
|
|||
- nova-cloud-controller:certificates
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
admin-password: openstack
|
||||
openstack-origin: cloud:bionic-train
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
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
|
||||
openstack-origin: cloud:bionic-train
|
||||
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: cloud:bionic-train
|
||||
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: cloud:bionic-train
|
||||
debug: true
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
constraints: mem=4G
|
||||
options:
|
||||
|
@ -103,4 +103,4 @@ applications:
|
|||
debug: true
|
||||
vault:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
charm: cs:~openstack-charmers/vault
|
||||
|
|
|
@ -41,29 +41,29 @@ relations:
|
|||
- nova-cloud-controller:certificates
|
||||
applications:
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
admin-password: openstack
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
charm: cs:~openstack-charmers/percona-cluster
|
||||
num_units: 1
|
||||
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:
|
||||
manage-neutron-plugin-legacy-mode: true
|
||||
|
@ -72,22 +72,22 @@ applications:
|
|||
neutron-security-groups: true
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
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: cloud:bionic-ussuri
|
||||
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: cloud:bionic-ussuri
|
||||
debug: true
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
constraints: mem=4G
|
||||
options:
|
||||
|
@ -105,4 +105,4 @@ applications:
|
|||
debug: true
|
||||
vault:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
charm: cs:~openstack-charmers/vault
|
||||
|
|
|
@ -26,20 +26,20 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-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
|
||||
neutron-api-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
|
||||
vault-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
|
||||
|
@ -49,7 +49,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
|
@ -58,7 +58,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
|
@ -67,7 +67,7 @@ applications:
|
|||
- '4'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -76,7 +76,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -88,10 +88,10 @@ applications:
|
|||
- '6'
|
||||
|
||||
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:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -100,7 +100,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
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
|
||||
|
@ -110,7 +110,7 @@ applications:
|
|||
- '8'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
constraints: mem=4G
|
||||
options:
|
||||
|
@ -134,7 +134,7 @@ applications:
|
|||
|
||||
vault:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
charm: cs:~openstack-charmers/vault
|
||||
to:
|
||||
- '11'
|
||||
|
||||
|
|
|
@ -26,20 +26,20 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-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
|
||||
neutron-api-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
|
||||
vault-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
|
||||
|
@ -49,7 +49,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
|
@ -58,7 +58,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
|
@ -67,7 +67,7 @@ applications:
|
|||
- '4'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -76,7 +76,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -88,10 +88,10 @@ applications:
|
|||
- '6'
|
||||
|
||||
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:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -100,7 +100,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
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
|
||||
|
@ -110,7 +110,7 @@ applications:
|
|||
- '8'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
constraints: mem=4G
|
||||
options:
|
||||
|
@ -134,7 +134,7 @@ applications:
|
|||
|
||||
vault:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
charm: cs:~openstack-charmers/vault
|
||||
to:
|
||||
- '11'
|
||||
|
||||
|
|
|
@ -26,20 +26,20 @@ machines:
|
|||
applications:
|
||||
|
||||
keystone-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
|
||||
neutron-api-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
|
||||
vault-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
|
||||
|
@ -49,7 +49,7 @@ applications:
|
|||
- '2'
|
||||
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
charm: cs:~openstack-charmers/rabbitmq-server
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
|
@ -58,7 +58,7 @@ applications:
|
|||
- '3'
|
||||
|
||||
glance:
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
charm: cs:~openstack-charmers/glance
|
||||
num_units: 1
|
||||
constraints: mem=1G
|
||||
options:
|
||||
|
@ -67,7 +67,7 @@ applications:
|
|||
- '4'
|
||||
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
charm: cs:~openstack-charmers/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -76,7 +76,7 @@ applications:
|
|||
- '5'
|
||||
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/neutron-api
|
||||
charm: cs:~openstack-charmers/neutron-api
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -88,10 +88,10 @@ applications:
|
|||
- '6'
|
||||
|
||||
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:
|
||||
openstack-origin: *openstack-origin
|
||||
|
@ -100,7 +100,7 @@ applications:
|
|||
- '7'
|
||||
|
||||
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
|
||||
|
@ -110,7 +110,7 @@ applications:
|
|||
- '8'
|
||||
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
charm: cs:~openstack-charmers/nova-compute
|
||||
num_units: 1
|
||||
constraints: mem=4G
|
||||
options:
|
||||
|
@ -134,7 +134,7 @@ applications:
|
|||
|
||||
vault:
|
||||
num_units: 1
|
||||
charm: cs:~openstack-charmers-next/vault
|
||||
charm: cs:~openstack-charmers/vault
|
||||
to:
|
||||
- '11'
|
||||
|
||||
|
|
|
@ -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