openstack
/
charm-nova-compute
Code Issues Proposed changes

Merge "Stable artefacts for stable/2023.1 (antelope)" into stable/2023.1

This commit is contained in:
Zuul 2023-05-09 15:46:15 +00:00 committed by Gerrit Code Review
parent 4bbd94abc0 2894811128
commit 8b3c5c18a6
6 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitreview
View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-nova-compute.git
defaultbranch=stable/2023.1

2
charm-helpers-hooks.yaml
View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/antelope
destination: hooks/charmhelpers
include:
- core

4
test-requirements.txt
View File

@ -20,8 +20,8 @@ cliff<3.0.0
coverage>=4.5.2
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
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/antelope#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/antelope#egg=zaza.openstack
# Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest

42
tests/bundles/jammy-antelope.yaml
View File

@ -38,25 +38,25 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -65,28 +65,28 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
barbican:
charm: ch:barbican
channel: latest/edge
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '20'
channel: 2023.1/edge
barbican-vault:
charm: ch:barbican-vault
channel: latest/edge
num_units: 0
channel: 2023.1/edge
vault:
charm: ch:vault
channel: latest/edge
num_units: 1
to:
- '21'
channel: 1.8/edge
ceph-osd:
charm: ch:ceph-osd
@ -102,7 +102,7 @@ applications:
- '14'
- '15'
- '16'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -114,14 +114,14 @@ applications:
- '17'
- '18'
- '19'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -132,7 +132,7 @@ applications:
debug: true
to:
- '4'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -144,7 +144,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -153,7 +153,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -163,7 +163,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -172,11 +172,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -185,7 +185,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ../../nova-compute.charm

42
tests/bundles/jammy-zed.yaml
View File

@ -38,25 +38,25 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -65,28 +65,28 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
barbican:
charm: ch:barbican
channel: latest/edge
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '20'
channel: 2023.1/edge
barbican-vault:
charm: ch:barbican-vault
channel: latest/edge
num_units: 0
channel: 2023.1/edge
vault:
charm: ch:vault
channel: latest/edge
num_units: 1
to:
- '21'
channel: 1.8/edge
ceph-osd:
charm: ch:ceph-osd
@ -102,7 +102,7 @@ applications:
- '14'
- '15'
- '16'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -114,14 +114,14 @@ applications:
- '17'
- '18'
- '19'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -132,7 +132,7 @@ applications:
debug: true
to:
- '4'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -144,7 +144,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -153,7 +153,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -163,7 +163,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -172,11 +172,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -185,7 +185,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ../../nova-compute.charm

42
tests/bundles/lunar-antelope.yaml
View File

@ -38,25 +38,25 @@ applications:
nova-cloud-controller-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
glance-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
neutron-api-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
placement-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
barbican-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
vault-mysql-router:
charm: ch:mysql-router
channel: latest/edge
channel: 8.0/edge
mysql-innodb-cluster:
charm: ch:mysql-innodb-cluster
@ -65,28 +65,28 @@ applications:
- '0'
- '1'
- '2'
channel: latest/edge
channel: 8.0/edge
barbican:
charm: ch:barbican
channel: latest/edge
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '20'
channel: 2023.1/edge
barbican-vault:
charm: ch:barbican-vault
channel: latest/edge
num_units: 0
channel: 2023.1/edge
vault:
charm: ch:vault
channel: latest/edge
num_units: 1
to:
- '21'
channel: 1.8/edge
ceph-osd:
charm: ch:ceph-osd
@ -102,7 +102,7 @@ applications:
- '14'
- '15'
- '16'
channel: latest/edge
channel: quincy/edge
ceph-mon:
charm: ch:ceph-mon
@ -114,14 +114,14 @@ applications:
- '17'
- '18'
- '19'
channel: latest/edge
channel: quincy/edge
rabbitmq-server:
charm: ch:rabbitmq-server
num_units: 1
to:
- '3'
channel: latest/edge
channel: 3.9/edge
nova-cloud-controller:
charm: ch:nova-cloud-controller
@ -132,7 +132,7 @@ applications:
debug: true
to:
- '4'
channel: latest/edge
channel: 2023.1/edge
neutron-api:
charm: ch:neutron-api
@ -144,7 +144,7 @@ applications:
neutron-security-groups: true
to:
- '5'
channel: latest/edge
channel: 2023.1/edge
keystone:
charm: ch:keystone
@ -153,7 +153,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: latest/edge
channel: 2023.1/edge
neutron-gateway:
charm: ch:neutron-gateway
@ -163,7 +163,7 @@ applications:
bridge-mappings: physnet1:br-ex
to:
- '7'
channel: latest/edge
channel: 2023.1/edge
glance:
charm: ch:glance
@ -172,11 +172,11 @@ applications:
openstack-origin: *openstack-origin
to:
- '8'
channel: latest/edge
channel: 2023.1/edge
neutron-openvswitch:
charm: ch:neutron-openvswitch
channel: latest/edge
channel: 2023.1/edge
placement:
charm: ch:placement
@ -185,7 +185,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '9'
channel: latest/edge
channel: 2023.1/edge
nova-compute:
charm: ../../nova-compute.charm