Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial commit for Contrail5 integration with SOC #2113

Draft
wants to merge 1 commit into
base: stable/5.0-pike
Choose a base branch
from
Draft

Initial commit for Contrail5 integration with SOC #2113

wants to merge 1 commit into from

Conversation

ghost
Copy link

@ghost ghost commented Apr 18, 2019

  • 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

- 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
@@ -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"]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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


Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

1 participant