Initial commit for Contrail5 integration with SOC #2113
Conversation
- Added contrail in list of ml2 plugins - Added additional configuration parameters for Contrail API and Analytics server ip and port - Disable dhcp agent and lbaas agent - Added neutron and nova configuration parameters for Contrail
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
| @@ -37,7 +37,7 @@ def self.networking_ml2_type_drivers_valid | |||
| end | |||
|
|
|||
| def self.networking_ml2_mechanism_drivers_valid | |||
| ["linuxbridge", "openvswitch", "cisco_nexus", "vmware_dvs", "cisco_apic_ml2", "apic_gbp"] | |||
| ["linuxbridge", "openvswitch", "cisco_nexus", "vmware_dvs", "cisco_apic_ml2", "apic_gbp", "contrail"] | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [105/100] (https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength)
| return a, d | ||
| end | ||
|
|
||
| def downgrade ta, td, a, d |
There was a problem hiding this comment.
Naming/UncommunicativeMethodParamName: Method parameter must be at least 3 characters long.
Style/MethodDefParentheses: Use def with parentheses when there are parameters. (https://github.com/bbatsov/ruby-style-guide#method-parens)
| @@ -0,0 +1,13 @@ | |||
| def upgrade ta, td, a, d | |||
There was a problem hiding this comment.
Naming/UncommunicativeMethodParamName: Method parameter must be at least 3 characters long.
Style/MethodDefParentheses: Use def with parentheses when there are parameters. (https://github.com/bbatsov/ruby-style-guide#method-parens)
| end | ||
| end | ||
|
|
||
|
|
There was a problem hiding this comment.
Layout/EmptyLines: Extra blank line detected. (https://github.com/bbatsov/ruby-style-guide#two-or-more-empty-lines)
| end | ||
| utils_systemd_service_restart node[:neutron][:platform][:dhcp_agent_name] do | ||
| action use_crowbar_pacemaker_service ? :disable : :enable | ||
|
|
There was a problem hiding this comment.
Layout/EmptyLines: Extra blank line detected. (https://github.com/bbatsov/ruby-style-guide#two-or-more-empty-lines)
| neutron[:neutron][:ml2_mechanism_drivers].include?("contrail") | ||
| service_plugins = "neutron_plugin_contrail.plugins.opencontrail.loadbalancer.v2.plugin.LoadBalancerPluginV2" | ||
| core_plugin = "neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2" | ||
| api_extensions_path = "/usr/lib/python2.7/site-packages/neutron_plugin_contrail/extensions:/usr/lib/python2.7/site-packages/neutron_lbaas/extensions" |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [151/100] (https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength)
| if neutron[:neutron][:networking_plugin] == "ml2" && | ||
| neutron[:neutron][:ml2_mechanism_drivers].include?("contrail") | ||
| service_plugins = "neutron_plugin_contrail.plugins.opencontrail.loadbalancer.v2.plugin.LoadBalancerPluginV2" | ||
| core_plugin = "neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2" |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [106/100] (https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength)
| service_plugins.push("neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2") | ||
| if neutron[:neutron][:networking_plugin] == "ml2" && | ||
| neutron[:neutron][:ml2_mechanism_drivers].include?("contrail") | ||
| service_plugins = "neutron_plugin_contrail.plugins.opencontrail.loadbalancer.v2.plugin.LoadBalancerPluginV2" |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [110/100] (https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength)
| if neutron[:neutron][:use_lbaas] | ||
| service_plugins.push("neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2") | ||
| if neutron[:neutron][:networking_plugin] == "ml2" && | ||
| neutron[:neutron][:ml2_mechanism_drivers].include?("contrail") |
There was a problem hiding this comment.
Layout/MultilineOperationIndentation: Use 4 (not 2) spaces for indenting a condition in an if statement spanning multiple lines. (https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylemultilineoperationindentation)
Analytics server ip and port