diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-15 13:15:29 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-15 13:15:29 +0000 |
commit | a309451920fa6d8f2120584b4778d6a7335fbca8 (patch) | |
tree | d56220d742e08fac9a082d50a1df1d1ab1844c8d /puppet/services/neutron-plugin-ml2-ovn.yaml | |
parent | 8424e2140d25fa7f47b9e8f2be03145f7a26c4a9 (diff) | |
parent | eaafa9247ac089a5f801b272f4705dac89d021fe (diff) |
Merge "OVN plugin configuration fixes"
Diffstat (limited to 'puppet/services/neutron-plugin-ml2-ovn.yaml')
-rw-r--r-- | puppet/services/neutron-plugin-ml2-ovn.yaml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/puppet/services/neutron-plugin-ml2-ovn.yaml b/puppet/services/neutron-plugin-ml2-ovn.yaml index 59346edc..4d4c3900 100644 --- a/puppet/services/neutron-plugin-ml2-ovn.yaml +++ b/puppet/services/neutron-plugin-ml2-ovn.yaml @@ -18,10 +18,14 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + OVNSouthboundServerPort: + description: Port of the OVN Southbound DB server + type: number + default: 6642 OVNDbConnectionTimeout: description: Timeout in seconds for the OVSDB connection transaction type: number - default: 60 + default: 180 OVNVifType: description: Type of VIF to be used for ports type: string @@ -43,6 +47,10 @@ parameters: description: OVN notification driver for Neutron QOS service plugin type: string default: NULL + NeutronGeneveMaxHeaderSize: + description: Geneve encapsulation header size + type: number + default: 38 resources: @@ -61,10 +69,12 @@ outputs: config_settings: map_merge: - get_attr: [NeutronMl2Base, role_data, config_settings] - - neutron::plugins::ovn::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout} - neutron::plugins::ovn::neutron_sync_mode: {get_param: OVNNeutronSyncMode} - neutron::plugins::ovn::ovn_l3_mode: true - neutron::plugins::ovn::vif_type: {get_param: OVNVifType} + - ovn::southbound::port: {get_param: OVNSouthboundServerPort} + neutron::plugins::ml2::ovn::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout} + neutron::plugins::ml2::ovn::neutron_sync_mode: {get_param: OVNNeutronSyncMode} + neutron::plugins::ml2::ovn::ovn_l3_mode: true + neutron::plugins::ml2::ovn::vif_type: {get_param: OVNVifType} neutron::server::qos_notification_drivers: {get_param: OVNQosDriver} + neutron::plugins::ml2::max_header_size: {get_param: NeutronGeneveMaxHeaderSize} step_config: | include ::tripleo::profile::base::neutron::plugins::ml2 |