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:
|
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 -->
|
<!-- LINKS -->
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ neutron-k8s requires the following relations:
|
|||||||
|
|
||||||
## OCI Images
|
## 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
|
## Contributing
|
||||||
|
|
||||||
|
@ -25,8 +25,8 @@ resources:
|
|||||||
neutron-server-image:
|
neutron-server-image:
|
||||||
type: oci-image
|
type: oci-image
|
||||||
description: OCI image for OpenStack Neutron API
|
description: OCI image for OpenStack Neutron API
|
||||||
# docker.io/kolla/ubuntu-binary-neutron-server:xena
|
# docker.io/kolla/ubuntu-binary-neutron-server:yoga
|
||||||
upstream-source: docker.io/kolla/ubuntu-binary-neutron-server@sha256:6aef64b32b44f341a239526118e6f2fa8e0c67773867e2d9d92a8ef48ba7f194
|
upstream-source: docker.io/kolla/ubuntu-binary-neutron-server@sha256:b473d7e2ecf9b3e9ec5be06cd8df3a06db80a50c629773ed388c2a253d7f3ca5
|
||||||
|
|
||||||
provides:
|
provides:
|
||||||
neutron-api:
|
neutron-api:
|
||||||
|
@ -7,4 +7,4 @@
|
|||||||
build_type: charmcraft
|
build_type: charmcraft
|
||||||
publish_charm: true
|
publish_charm: true
|
||||||
charmcraft_channel: 2.0/stable
|
charmcraft_channel: 2.0/stable
|
||||||
publish_channel: xena/edge
|
publish_channel: yoga/edge
|
||||||
|
@ -3,12 +3,12 @@ bundle: kubernetes
|
|||||||
applications:
|
applications:
|
||||||
traefik:
|
traefik:
|
||||||
charm: ch:traefik-k8s
|
charm: ch:traefik-k8s
|
||||||
channel: edge
|
channel: 1.0/stable
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
traefik-public:
|
traefik-public:
|
||||||
charm: ch:traefik-k8s
|
charm: ch:traefik-k8s
|
||||||
channel: edge
|
channel: 1.0/stable
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
options:
|
options:
|
||||||
@ -20,12 +20,12 @@ applications:
|
|||||||
trust: false
|
trust: false
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
charm: ch:rabbitmq-k8s
|
charm: ch:rabbitmq-k8s
|
||||||
channel: edge
|
channel: 3.9/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
keystone:
|
keystone:
|
||||||
charm: ch:keystone-k8s
|
charm: ch:keystone-k8s
|
||||||
channel: edge
|
channel: yoga/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
options:
|
options:
|
||||||
@ -35,30 +35,31 @@ applications:
|
|||||||
credential-keys: 5M
|
credential-keys: 5M
|
||||||
glance:
|
glance:
|
||||||
charm: ch:glance-k8s
|
charm: ch:glance-k8s
|
||||||
channel: edge
|
channel: yoga/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
storage:
|
storage:
|
||||||
local-repository: 5G
|
local-repository: 5G
|
||||||
nova:
|
nova:
|
||||||
charm: ch:nova-k8s
|
charm: ch:nova-k8s
|
||||||
channel: edge
|
channel: yoga/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
placement:
|
placement:
|
||||||
charm: ch:placement-k8s
|
charm: ch:placement-k8s
|
||||||
channel: edge
|
channel: yoga/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
neutron:
|
neutron:
|
||||||
|
charm: ch:neutron-k8s
|
||||||
charm: ../../neutron-k8s.charm
|
charm: ../../neutron-k8s.charm
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
resources:
|
resources:
|
||||||
neutron-server-image: kolla/ubuntu-binary-neutron-server:xena
|
neutron-server-image: kolla/ubuntu-binary-neutron-server:yoga
|
||||||
ovn-central:
|
ovn-central:
|
||||||
charm: ch:ovn-central-k8s
|
charm: ch:ovn-central-k8s
|
||||||
channel: edge
|
channel: 22.03/edge
|
||||||
scale: 1
|
scale: 1
|
||||||
trust: true
|
trust: true
|
||||||
vault:
|
vault:
|
@ -1,7 +1,7 @@
|
|||||||
gate_bundles:
|
gate_bundles:
|
||||||
- xena
|
- smoke
|
||||||
smoke_bundles:
|
smoke_bundles:
|
||||||
- xena
|
- smoke
|
||||||
configure:
|
configure:
|
||||||
- zaza.openstack.charm_tests.keystone.setup.wait_for_all_endpoints
|
- zaza.openstack.charm_tests.keystone.setup.wait_for_all_endpoints
|
||||||
- zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
|
- zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
|
||||||
@ -11,9 +11,9 @@ tests:
|
|||||||
- zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneMinimal
|
- zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneMinimal
|
||||||
tests_options:
|
tests_options:
|
||||||
trust:
|
trust:
|
||||||
- xena
|
- smoke
|
||||||
ignore_hard_deploy_errors:
|
ignore_hard_deploy_errors:
|
||||||
- xena
|
- smoke
|
||||||
|
|
||||||
tempest:
|
tempest:
|
||||||
default:
|
default:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user