Enable bgp dynamic routing for Ocata
Change-Id: I00fd1d6098aee7f0e5287c8655dd9db843894a26
This commit is contained in:
parent
3592e44ce5
commit
1ad715f733
@ -20,7 +20,7 @@ Neutron dynamic routing relies on services from the rabbitmq-server charm and as
|
||||
juju add-relation neutron-api percona-cluster
|
||||
juju add-relation neutron-api rabbitmq-server
|
||||
|
||||
NOTE: This charm supports OpenStack versions Pike or newer. Specify version
|
||||
NOTE: This charm supports OpenStack versions Ocata or newer. Specify version
|
||||
to install using the openstack-origin and source configuration options.
|
||||
|
||||
# Feature Usage
|
||||
|
@ -177,7 +177,7 @@ class DRAgentCharm(charms_openstack.charm.OpenStackCharm):
|
||||
functionality to manage a dragent unit.
|
||||
"""
|
||||
|
||||
release = 'pike'
|
||||
release = 'ocata'
|
||||
name = 'neutron-dynamic-routing'
|
||||
packages = PACKAGES
|
||||
default_service = 'neutron-bgp-dragent'
|
||||
@ -196,6 +196,7 @@ class DRAgentCharm(charms_openstack.charm.OpenStackCharm):
|
||||
# Package codename map for neutron-dynamic-routing-common
|
||||
package_codenames = {
|
||||
'neutron-dynamic-routing-common': collections.OrderedDict([
|
||||
('10', 'ocata'),
|
||||
('11', 'pike'),
|
||||
('12', 'queens'),
|
||||
('13', 'rocky'),
|
||||
|
@ -37,7 +37,7 @@ charm.use_defaults(
|
||||
def publish_bgp_info(endpoint):
|
||||
"""Publish BGP information about this unit to interface-bgp peers
|
||||
"""
|
||||
if dragent.get_os_codename() == 'pike':
|
||||
if dragent.get_os_codename() in ['ocata', 'pike']:
|
||||
use_16bit_asn = True
|
||||
else:
|
||||
use_16bit_asn = False
|
||||
|
44
src/tests/bundles/xenial-ocata-functional.yaml
Normal file
44
src/tests/bundles/xenial-ocata-functional.yaml
Normal file
@ -0,0 +1,44 @@
|
||||
series: xenial
|
||||
relations:
|
||||
- [neutron-dynamic-routing, rabbitmq-server]
|
||||
- [neutron-dynamic-routing, quagga]
|
||||
- [keystone, mysql]
|
||||
- [neutron-api, mysql]
|
||||
- [neutron-api, rabbitmq-server]
|
||||
- [neutron-api, keystone]
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/xenial/keystone
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
options: {admin-password: openstack, admin-token: ubuntutesting, openstack-origin: 'cloud:xenial-ocata'}
|
||||
series: xenial
|
||||
mysql:
|
||||
charm: cs:~openstack-charmers-next/xenial/percona-cluster
|
||||
constraints: mem=4G
|
||||
num_units: 1
|
||||
options: {source: 'cloud:xenial-ocata'}
|
||||
series: xenial
|
||||
neutron-api:
|
||||
charm: cs:~openstack-charmers-next/xenial/neutron-api
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
options: {flat-network-providers: physnet1, neutron-security-groups: true, openstack-origin: 'cloud:xenial-ocata'}
|
||||
series: xenial
|
||||
neutron-dynamic-routing:
|
||||
charm: ../../../neutron-dynamic-routing
|
||||
num_units: 1
|
||||
options: {openstack-origin: 'cloud:xenial-ocata'}
|
||||
series: xenial
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/xenial/rabbitmq-server
|
||||
constraints: mem=1G
|
||||
num_units: 1
|
||||
options: {source: 'cloud:xenial-ocata'}
|
||||
series: xenial
|
||||
quagga:
|
||||
charm: cs:~openstack-charmers-next/xenial/quagga
|
||||
num_units: 1
|
||||
options: {use-16bit-asn: True}
|
||||
series: xenial
|
||||
|
Loading…
x
Reference in New Issue
Block a user