Use OVN instead of neutron-openvswitch
Update the bundles to use neutron OVN plugin instead of neutron-openvswitch
This commit is contained in:
Felipe Reyes
parent
5aedb77253
commit
ff0cc4a9a2
@ -1,5 +1,6 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-xena
|
||||
data-port: &data-port to-be-set
|
||||
|
||||
local_overlay_enabled: False
|
||||
|
||||
@ -87,19 +88,6 @@ applications:
|
||||
neutron-security-groups: true
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
@ -169,14 +157,30 @@ applications:
|
||||
cluster_count: 3
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api-plugin-ovn:
|
||||
charm: ch:neutron-api-plugin-ovn
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
|
||||
ovn-central:
|
||||
charm: ch:ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
channel: latest/edge
|
||||
|
||||
ovn-chassis:
|
||||
charm: ch:ovn-chassis
|
||||
channel: latest/stable
|
||||
options:
|
||||
ovn-bridge-mappings: physnet1:br-ex
|
||||
bridge-interface-mappings: *data-port
|
||||
|
||||
relations:
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
@ -191,9 +195,6 @@ relations:
|
||||
- - 'neutron-api:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'neutron-api:shared-db'
|
||||
- 'neutron-api-mysql-router:shared-db'
|
||||
- - 'neutron-api-mysql-router:db-router'
|
||||
@ -202,9 +203,6 @@ relations:
|
||||
- - 'neutron-api:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
@ -225,15 +223,6 @@ relations:
|
||||
- - 'nova-cloud-controller:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:quantum-network-service'
|
||||
- 'neutron-gateway:quantum-network-service'
|
||||
|
||||
- - 'nova-compute:neutron-plugin'
|
||||
- 'neutron-openvswitch:neutron-plugin'
|
||||
|
||||
- - 'neutron-openvswitch:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
@ -270,9 +259,6 @@ relations:
|
||||
- - 'ntp:juju-info'
|
||||
- 'nova-compute:juju-info'
|
||||
|
||||
- - 'ntp:juju-info'
|
||||
- 'neutron-gateway:juju-info'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
@ -317,3 +303,18 @@ relations:
|
||||
- "keystone-hacluster:ha"
|
||||
- - "openstack-dashboard:ha"
|
||||
- "openstack-dashboard-hacluster:ha"
|
||||
|
||||
- - 'neutron-api-plugin-ovn:neutron-plugin'
|
||||
- 'neutron-api:neutron-plugin-api-subordinate'
|
||||
- - 'ovn-central:certificates'
|
||||
- 'vault:certificates'
|
||||
- - 'ovn-central:ovsdb-cms'
|
||||
- 'neutron-api-plugin-ovn:ovsdb-cms'
|
||||
- - 'ovn-chassis:nova-compute'
|
||||
- 'nova-compute:neutron-plugin'
|
||||
- - 'ovn-chassis:certificates'
|
||||
- 'vault:certificates'
|
||||
- - 'ovn-chassis:ovsdb'
|
||||
- 'ovn-central:ovsdb'
|
||||
- - 'vault:certificates'
|
||||
- 'neutron-api-plugin-ovn:certificates'
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin cloud:focal-yoga
|
||||
data-port: &data-port to-be-set
|
||||
|
||||
local_overlay_enabled: False
|
||||
|
||||
@ -87,19 +88,6 @@ applications:
|
||||
neutron-security-groups: true
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
@ -169,14 +157,30 @@ applications:
|
||||
cluster_count: 3
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api-plugin-ovn:
|
||||
charm: ch:neutron-api-plugin-ovn
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
|
||||
ovn-central:
|
||||
charm: ch:ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
channel: latest/edge
|
||||
|
||||
ovn-chassis:
|
||||
charm: ch:ovn-chassis
|
||||
channel: latest/stable
|
||||
options:
|
||||
ovn-bridge-mappings: physnet1:br-ex
|
||||
bridge-interface-mappings: *data-port
|
||||
|
||||
relations:
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
@ -191,9 +195,6 @@ relations:
|
||||
- - 'neutron-api:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'neutron-api:shared-db'
|
||||
- 'neutron-api-mysql-router:shared-db'
|
||||
- - 'neutron-api-mysql-router:db-router'
|
||||
@ -202,9 +203,6 @@ relations:
|
||||
- - 'neutron-api:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
@ -225,15 +223,6 @@ relations:
|
||||
- - 'nova-cloud-controller:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:quantum-network-service'
|
||||
- 'neutron-gateway:quantum-network-service'
|
||||
|
||||
- - 'nova-compute:neutron-plugin'
|
||||
- 'neutron-openvswitch:neutron-plugin'
|
||||
|
||||
- - 'neutron-openvswitch:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
@ -270,9 +259,6 @@ relations:
|
||||
- - 'ntp:juju-info'
|
||||
- 'nova-compute:juju-info'
|
||||
|
||||
- - 'ntp:juju-info'
|
||||
- 'neutron-gateway:juju-info'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
@ -317,3 +303,18 @@ relations:
|
||||
- "keystone-hacluster:ha"
|
||||
- - "openstack-dashboard:ha"
|
||||
- "openstack-dashboard-hacluster:ha"
|
||||
|
||||
- - 'neutron-api-plugin-ovn:neutron-plugin'
|
||||
- 'neutron-api:neutron-plugin-api-subordinate'
|
||||
- - 'ovn-central:certificates'
|
||||
- 'vault:certificates'
|
||||
- - 'ovn-central:ovsdb-cms'
|
||||
- 'neutron-api-plugin-ovn:ovsdb-cms'
|
||||
- - 'ovn-chassis:nova-compute'
|
||||
- 'nova-compute:neutron-plugin'
|
||||
- - 'ovn-chassis:certificates'
|
||||
- 'vault:certificates'
|
||||
- - 'ovn-chassis:ovsdb'
|
||||
- 'ovn-central:ovsdb'
|
||||
- - 'vault:certificates'
|
||||
- 'neutron-api-plugin-ovn:certificates'
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
openstack-origin: &openstack-origin cloud:distro
|
||||
data-port: &data-port to-be-set
|
||||
|
||||
local_overlay_enabled: False
|
||||
|
||||
series: jammy
|
||||
series: focal
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
@ -87,19 +88,6 @@ applications:
|
||||
neutron-security-groups: true
|
||||
channel: latest/edge
|
||||
|
||||
neutron-gateway:
|
||||
charm: ch:neutron-gateway
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
bridge-mappings: physnet1:br-ex
|
||||
channel: latest/edge
|
||||
|
||||
neutron-openvswitch:
|
||||
charm: ch:neutron-openvswitch
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
@ -169,14 +157,30 @@ applications:
|
||||
cluster_count: 3
|
||||
channel: latest/edge
|
||||
|
||||
neutron-api-plugin-ovn:
|
||||
charm: ch:neutron-api-plugin-ovn
|
||||
num_units: 0
|
||||
channel: latest/edge
|
||||
|
||||
ovn-central:
|
||||
charm: ch:ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
channel: latest/edge
|
||||
|
||||
ovn-chassis:
|
||||
charm: ch:ovn-chassis
|
||||
channel: latest/stable
|
||||
options:
|
||||
ovn-bridge-mappings: physnet1:br-ex
|
||||
bridge-interface-mappings: *data-port
|
||||
|
||||
relations:
|
||||
|
||||
- - 'nova-compute:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'keystone:shared-db'
|
||||
- 'keystone-mysql-router:shared-db'
|
||||
- - 'keystone-mysql-router:db-router'
|
||||
@ -191,9 +195,6 @@ relations:
|
||||
- - 'neutron-api:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
- - 'neutron-openvswitch:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'neutron-api:shared-db'
|
||||
- 'neutron-api-mysql-router:shared-db'
|
||||
- - 'neutron-api-mysql-router:db-router'
|
||||
@ -202,9 +203,6 @@ relations:
|
||||
- - 'neutron-api:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'neutron-gateway:neutron-plugin-api'
|
||||
- 'neutron-api:neutron-plugin-api'
|
||||
|
||||
- - 'glance:shared-db'
|
||||
- 'glance-mysql-router:shared-db'
|
||||
- - 'glance-mysql-router:db-router'
|
||||
@ -225,15 +223,6 @@ relations:
|
||||
- - 'nova-cloud-controller:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'nova-cloud-controller:quantum-network-service'
|
||||
- 'neutron-gateway:quantum-network-service'
|
||||
|
||||
- - 'nova-compute:neutron-plugin'
|
||||
- 'neutron-openvswitch:neutron-plugin'
|
||||
|
||||
- - 'neutron-openvswitch:amqp'
|
||||
- 'rabbitmq-server:amqp'
|
||||
|
||||
- - 'openstack-dashboard:identity-service'
|
||||
- 'keystone:identity-service'
|
||||
|
||||
@ -270,9 +259,6 @@ relations:
|
||||
- - 'ntp:juju-info'
|
||||
- 'nova-compute:juju-info'
|
||||
|
||||
- - 'ntp:juju-info'
|
||||
- 'neutron-gateway:juju-info'
|
||||
|
||||
- - 'vault:shared-db'
|
||||
- 'vault-mysql-router:shared-db'
|
||||
- - 'vault-mysql-router:db-router'
|
||||
@ -317,3 +303,18 @@ relations:
|
||||
- "keystone-hacluster:ha"
|
||||
- - "openstack-dashboard:ha"
|
||||
- "openstack-dashboard-hacluster:ha"
|
||||
|
||||
- - 'neutron-api-plugin-ovn:neutron-plugin'
|
||||
- 'neutron-api:neutron-plugin-api-subordinate'
|
||||
- - 'ovn-central:certificates'
|
||||
- 'vault:certificates'
|
||||
- - 'ovn-central:ovsdb-cms'
|
||||
- 'neutron-api-plugin-ovn:ovsdb-cms'
|
||||
- - 'ovn-chassis:nova-compute'
|
||||
- 'nova-compute:neutron-plugin'
|
||||
- - 'ovn-chassis:certificates'
|
||||
- 'vault:certificates'
|
||||
- - 'ovn-chassis:ovsdb'
|
||||
- 'ovn-central:ovsdb'
|
||||
- - 'vault:certificates'
|
||||
- 'neutron-api-plugin-ovn:certificates'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user