Update to OpenStack Yoga
Update OCI images. Update testing bundle. Update OSCI publication target. Change-Id: Ib9cbcc7c8c1deeb4f41adc4a4b45e6f060d698cf
This commit is contained in:
parent
f6f2b18a08
commit
67973afcb3
@ -48,7 +48,7 @@ run:
|
||||
|
||||
To deploy the local test instance:
|
||||
|
||||
juju deploy ./neutron-k8s_ubuntu-20.04-amd64.charm --trust --resource neutron-server-image=kolla/ubuntu-binary-neutron-server:xena
|
||||
juju deploy ./neutron-k8s_ubuntu-20.04-amd64.charm --trust --resource neutron-server-image=kolla/ubuntu-binary-neutron-server:yoga
|
||||
|
||||
<!-- LINKS -->
|
||||
|
||||
|
@ -50,7 +50,7 @@ neutron-k8s requires the following relations:
|
||||
|
||||
## OCI Images
|
||||
|
||||
The charm by default uses `docker.io/kolla/ubuntu-binary-neutron-server:xena` image.
|
||||
The charm by default uses `docker.io/kolla/ubuntu-binary-neutron-server:yoga` image.
|
||||
|
||||
## Contributing
|
||||
|
||||
|
@ -25,8 +25,8 @@ resources:
|
||||
neutron-server-image:
|
||||
type: oci-image
|
||||
description: OCI image for OpenStack Neutron API
|
||||
# docker.io/kolla/ubuntu-binary-neutron-server:xena
|
||||
upstream-source: docker.io/kolla/ubuntu-binary-neutron-server@sha256:6aef64b32b44f341a239526118e6f2fa8e0c67773867e2d9d92a8ef48ba7f194
|
||||
# docker.io/kolla/ubuntu-binary-neutron-server:yoga
|
||||
upstream-source: docker.io/kolla/ubuntu-binary-neutron-server@sha256:b473d7e2ecf9b3e9ec5be06cd8df3a06db80a50c629773ed388c2a253d7f3ca5
|
||||
|
||||
provides:
|
||||
neutron-api:
|
||||
|
@ -7,4 +7,4 @@
|
||||
build_type: charmcraft
|
||||
publish_charm: true
|
||||
charmcraft_channel: 2.0/stable
|
||||
publish_channel: xena/edge
|
||||
publish_channel: yoga/edge
|
||||
|
@ -3,12 +3,12 @@ bundle: kubernetes
|
||||
applications:
|
||||
traefik:
|
||||
charm: ch:traefik-k8s
|
||||
channel: edge
|
||||
channel: 1.0/stable
|
||||
scale: 1
|
||||
trust: true
|
||||
traefik-public:
|
||||
charm: ch:traefik-k8s
|
||||
channel: edge
|
||||
channel: 1.0/stable
|
||||
scale: 1
|
||||
trust: true
|
||||
options:
|
||||
@ -20,12 +20,12 @@ applications:
|
||||
trust: false
|
||||
rabbitmq:
|
||||
charm: ch:rabbitmq-k8s
|
||||
channel: edge
|
||||
channel: 3.9/edge
|
||||
scale: 1
|
||||
trust: true
|
||||
keystone:
|
||||
charm: ch:keystone-k8s
|
||||
channel: edge
|
||||
channel: yoga/edge
|
||||
scale: 1
|
||||
trust: true
|
||||
options:
|
||||
@ -35,30 +35,31 @@ applications:
|
||||
credential-keys: 5M
|
||||
glance:
|
||||
charm: ch:glance-k8s
|
||||
channel: edge
|
||||
channel: yoga/edge
|
||||
scale: 1
|
||||
trust: true
|
||||
storage:
|
||||
local-repository: 5G
|
||||
nova:
|
||||
charm: ch:nova-k8s
|
||||
channel: edge
|
||||
channel: yoga/edge
|
||||
scale: 1
|
||||
trust: true
|
||||
placement:
|
||||
charm: ch:placement-k8s
|
||||
channel: edge
|
||||
channel: yoga/edge
|
||||
scale: 1
|
||||
trust: true
|
||||
neutron:
|
||||
charm: ch:neutron-k8s
|
||||
charm: ../../neutron-k8s.charm
|
||||
scale: 1
|
||||
trust: true
|
||||
resources:
|
||||
neutron-server-image: kolla/ubuntu-binary-neutron-server:xena
|
||||
neutron-server-image: kolla/ubuntu-binary-neutron-server:yoga
|
||||
ovn-central:
|
||||
charm: ch:ovn-central-k8s
|
||||
channel: edge
|
||||
channel: 22.03/edge
|
||||
scale: 1
|
||||
trust: true
|
||||
vault:
|
@ -1,7 +1,7 @@
|
||||
gate_bundles:
|
||||
- xena
|
||||
- smoke
|
||||
smoke_bundles:
|
||||
- xena
|
||||
- smoke
|
||||
configure:
|
||||
- zaza.openstack.charm_tests.keystone.setup.wait_for_all_endpoints
|
||||
- zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
|
||||
@ -11,9 +11,9 @@ tests:
|
||||
- zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneMinimal
|
||||
tests_options:
|
||||
trust:
|
||||
- xena
|
||||
- smoke
|
||||
ignore_hard_deploy_errors:
|
||||
- xena
|
||||
- smoke
|
||||
|
||||
tempest:
|
||||
default:
|
||||
|
Loading…
x
Reference in New Issue
Block a user