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.

Sign up for GitHub

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

Jump to bottom

[4.0][neutron][Cisco ACI]: Multiple VMM domain support (SOC - 10471) #2228

Open
wants to merge 2 commits into
base: stable/4.0
Choose a base branch
from
Open

[4.0][neutron][Cisco ACI]: Multiple VMM domain support (SOC - 10471) #2228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
914b93c
Changes to integrate with ACI 4.1 and new packages (SOC-10403)
mmnelemane Sep 2, 2019
dacd4ee
[neutron][Cisco ACI] Multi-VMM domain support (SOC - 10471)
Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions chef/cookbooks/neutron/attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
default[:neutron][:metadata_agent_config_file] = "/etc/neutron/neutron-metadata-agent.conf.d/100-metadata_agent.conf"
default[:neutron][:ml2_config_file] = "/etc/neutron/neutron.conf.d/110-ml2.conf"
default[:neutron][:nsx_config_file] = "/etc/neutron/neutron.conf.d/110-nsx.conf"
default[:neutron][:ml2_cisco_config_file] = "/etc/neutron/neutron.conf.d/115-ml2_cisco.conf"
default[:neutron][:ml2_cisco_apic_config_file] = "/etc/neutron/neutron.conf.d/115-ml2_cisco_apic.conf"
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. [102/100] (https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength)

default[:neutron][:opflex_config_file] = "/etc/opflex-agent-ovs/conf.d/10-opflex-agent-ovs.conf"
default[:neutron][:rpc_workers] = 1

default[:neutron][:db][:database] = "neutron"
Expand Down Expand Up @@ -126,8 +129,8 @@
cisco_apic_pkgs: ["python-apicapi",
"python-neutron-ml2-driver-apic"],
cisco_apic_gbp_pkgs: ["openstack-neutron-gbp",
"python-gbpclient"],
cisco_opflex_pkgs: ["agent-ovs",
"python-group-based-policy-client"],
cisco_opflex_pkgs: ["opflex-agent",
"lldpd",
"openstack-neutron-opflex-agent"],
infoblox_pkgs: ["python-infoblox-client",
Expand Down Expand Up @@ -172,8 +175,8 @@
cisco_apic_pkgs: ["python-apicapi",
"python-neutron-ml2-driver-apic"],
cisco_apic_gbp_pkgs: ["openstack-neutron-gbp",
"python-gbpclient"],
cisco_opflex_pkgs: ["agent-ovs",
"python-group-based-policy-client"],
cisco_opflex_pkgs: ["opflex-agent",
"lldpd",
"neutron-opflex-agent"],
infoblox_pkgs: [],
Expand Down
14 changes: 8 additions & 6 deletions chef/cookbooks/neutron/recipes/cisco_apic_agents.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,14 @@
end

# Update config file from template
opflex_agent_conf = "/etc/opflex-agent-ovs/conf.d/10-opflex-agent-ovs.conf"
apic = neutron[:neutron][:apic]
opflex_list = apic[:opflex].select { |i| i[:nodes].include? node[:hostname] }
opflex_list.any? || raise("Opflex instance not found for node '#{node[:hostname]}'")
opflex_list.one? || raise("Multiple opflex instances found for node '#{node[:hostname]}'")
opflex = opflex_list.first
template opflex_agent_conf do
template node[:neutron][:opflex_config_file] do
cookbook "neutron"
source "10-opflex-agent-ovs.conf.erb"
source "opflex-agent-ovs.conf.erb"
mode "0755"
owner "root"
group neutron[:neutron][:platform][:group]
Expand All @@ -110,6 +109,9 @@
socketgroup: neutron[:neutron][:platform][:group],
opflex_peer_ip: opflex[:peer_ip],
opflex_peer_port: opflex[:peer_port],
opflex_ssl_mode: opflex[:ssl_mode],
opflex_int_bridge: opflex[:integration_bridge],
opflex_access_bridge: opflex[:access_bridge],
opflex_vxlan_encap_iface: opflex[:vxlan][:encap_iface],
opflex_vxlan_uplink_iface: opflex[:vxlan][:uplink_iface],
opflex_vxlan_uplink_vlan: opflex[:vxlan][:uplink_vlan],
Expand All @@ -132,8 +134,8 @@
end
utils_systemd_service_restart "neutron-opflex-agent"

service "agent-ovs" do
service "opflex-agent" do
action [:enable, :start]
subscribes :restart, resources("template[#{opflex_agent_conf}]")
subscribes :restart, resources("template[#{node[:neutron][:opflex_config_file]}]")
end
utils_systemd_service_restart "agent-ovs"
utils_systemd_service_restart "opflex-agent"
7 changes: 6 additions & 1 deletion chef/cookbooks/neutron/recipes/cisco_apic_support.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
end

aciswitches = node[:neutron][:apic][:apic_switches].to_hash
template "/etc/neutron/neutron-server.conf.d/100-ml2_conf_cisco_apic.ini.conf" do
acivmms = node[:neutron][:apic][:apic_vmms]

template node[:neutron][:ml2_cisco_apic_config_file] do
cookbook "neutron"
source "ml2_conf_cisco_apic.ini.erb"
mode "0640"
Expand All @@ -30,6 +32,9 @@
variables(
vpc_pairs: node[:neutron][:apic][:vpc_pairs],
apic_switches: aciswitches,
optimized_dhcp: node[:neutron][:apic][:optimized_dhcp],
optimized_metadata: node[:neutron][:apic][:optimized_metadata],
apic_vmms: acivmms,
ml2_mechanism_drivers: node[:neutron][:ml2_mechanism_drivers],
policy_drivers: "implicit_policy,apic",
default_ip_pool: "192.168.0.0/16"
Expand Down
4 changes: 2 additions & 2 deletions chef/cookbooks/neutron/recipes/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
else
cisco_nexus_link_action = "delete"
end
link "/etc/neutron/neutron-server.conf.d/100-ml2_conf_cisco.ini.conf" do
link "#{node[:neutron][:platform][:ml2_cisco_config_file]}" do
Copy link

Choose a reason for hiding this comment

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

Style/UnneededInterpolation: Prefer to_s over string interpolation.

to "/etc/neutron/plugins/ml2/ml2_conf_cisco.ini"
action cisco_nexus_link_action
notifies :restart, "service[#{node[:neutron][:platform][:service_name]}]"
Expand All @@ -99,7 +99,7 @@
else
cisco_apic_link_action = "delete"
end
link "/etc/neutron/neutron-server.conf.d/100-ml2_conf_cisco_apic.ini.conf" do
link "#{node[:neutron][:platform][:ml2_cisco_apic_config_file]}" do
Copy link

Choose a reason for hiding this comment

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

Style/UnneededInterpolation: Prefer to_s over string interpolation.

to "/etc/neutron/plugins/ml2/ml2_conf_cisco_apic.ini"
action cisco_apic_link_action
notifies :restart, "service[#{node[:neutron][:platform][:service_name]}]"
Expand Down
15 changes: 12 additions & 3 deletions chef/cookbooks/neutron/templates/default/ml2_conf_cisco_apic.ini.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apic_system_id=<%= node[:neutron][:apic][:system_id] %>
[opflex]
networks = *
[ml2_cisco_apic]
[apic]
apic_hosts=<%= node[:neutron][:apic][:hosts] %>
apic_username=<%= node[:neutron][:apic][:username] %>
apic_password=<%= node[:neutron][:apic][:password] %>
Expand All @@ -11,8 +11,8 @@ apic_name_mapping = use_name
apic_clear_node_profiles = True
enable_aci_routing = True
apic_arp_flooding = True
enable_optimized_metadata = <%= node[:neutron][:apic][:optimized_metadata] %>
enable_optimized_dhcp = <%= node[:neutron][:apic][:optimized_dhcp] %>
enable_optimized_metadata = <%= @optimized_metadata %>
enable_optimized_dhcp = <%= @optimized_dhcp %>
apic_provision_infra = True
apic_provision_hostlinks = True
<% unless @vpc_pairs.nil? -%>
Expand Down Expand Up @@ -41,3 +41,12 @@ enable_nat = <%= node[:neutron][:apic][:ext_net][:nat_enabled] %>
<% end -%>
external_epg = <%= node[:neutron][:apic][:ext_net][:ext_epg] %>
host_pool_cidr = <%= node[:neutron][:apic][:ext_net][:host_pool_cidr] %>

<% @apic_vmms.each do |vmm_domain| -%>
[apic_vmdom:<%= vmm_domain[:vmm_name]%>]
vmm_type = <%= vmm_domain[:vmm_type]%>
<% if vmm_domain[:vlan_ranges] -%>
vlan_ranges = <%= vmm_domain[:vlan_ranges] %>
<% end -%>
<% end -%>

5 changes: 3 additions & 2 deletions ...ates/default/10-opflex-agent-ovs.conf.erb → ...mplates/default/opflex-agent-ovs.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{"hostname": "<%= @opflex_peer_ip %>", "port": "<%= @opflex_peer_port %>"}
],
"ssl": {
"mode": "enabled",
"mode": "<%= @opflex_ssl_mode %>",
"ca-store": "/etc/ssl/certs/"
},
"inspector": {
Expand All @@ -36,7 +36,8 @@

"renderers": {
"stitched-mode": {
"ovs-bridge-name": "br-int",
"int-bridge-name": "<%= @opflex_int_bridge %>",
"access-bridge-name": "<%= @opflex_access_bridge %>",
"encap": {
"vxlan" : {
"encap-iface": "<%= @opflex_vxlan_encap_iface %>",
Expand Down
15 changes: 15 additions & 0 deletions chef/data_bags/crowbar/migrate/neutron/125_add_apic_multi_vmm_domains.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
def upgrade(tattr, tdep, attr, dep)
unless attr["apic"].key?("apic_vmms")
Copy link

Choose a reason for hiding this comment

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

Style/IfUnlessModifier: Favor modifier unless usage when having a single-line body. Another good alternative is the usage of control flow &&/||. (https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier)

attr["apic"]["apic_vmms"] = tattr["apic"]["apic_vmms"]
end

return attr, dep
end

def downgrade(tattr, tdep, attr, dep)
unless tattr["apic"].key?("apic_vmms")
attr["apic"].delete("apic_vmms") if attr.key?("apic_vmms")
end

return attr, dep
end
19 changes: 16 additions & 3 deletions chef/data_bags/crowbar/template-neutron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,12 @@
"nodes" : [],
"peer_ip": "",
"peer_port": 8009,
"ssl_mode": "encrypted",
"encap": "vxlan",
"integration_bridge": "br-int",
"access_bridge": "br-fabric",
"vxlan": {
"encap_iface": "br-int_vxlan0",
"encap_iface": "br-fab_vxlan0",
"uplink_iface": "vlan.4093",
"uplink_vlan": 4093,
"remote_ip": "",
Expand Down Expand Up @@ -97,7 +100,17 @@
}
}
}
}
},
"apic_vmms": [{
"vmm_name": "soc_kvm_domain",
"vmm_type": "openstack",
"vlan_ranges": ""
},
{
"vmm_name": "soc_vm_domain",
"vmm_type": "vmware",
"vlan_ranges": ""
}]
},
"allow_overlapping_ips": true,
"use_syslog": false,
Expand Down Expand Up @@ -195,7 +208,7 @@
"neutron": {
"crowbar-revision": 0,
"crowbar-applied": false,
"schema-revision": 124,
"schema-revision": 125,
"element_states": {
"neutron-server": [ "readying", "ready", "applying" ],
"neutron-network": [ "readying", "ready", "applying" ],
Expand Down
12 changes: 11 additions & 1 deletion chef/data_bags/crowbar/template-neutron.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@
"nodes": { "type" : "seq", "required" : true, "sequence": [ { "type": "str" } ] },
"peer_ip": { "type": "str", "required" : true },
"peer_port": { "type": "int", "required" : true },
"ssl_mode": { "type": "str", "required": true },
"encap": { "type": "str", "required": true },
"integration_bridge": { "type": "str", "required": true },
"access_bridge": { "type": "str", "required": true },
"vxlan": { "type": "map", "required": true, "mapping" : {
"encap_iface": {"type": "str", "required": true },
"uplink_iface": { "type": "str", "required": true },
Expand All @@ -93,7 +96,14 @@
}}
}}
}}
}
},
"apic_vmms": { "type" : "seq", "required" : true, "sequence" : [ {
"type" : "map", "required" : true, "mapping" : {
"vmm_name": { "type": "str", "required": true },
"vmm_type": { "type": "str", "required": true },
"vlan_ranges": { "type": "str", "required": true }
}
} ] }
}},
"allow_overlapping_ips": { "type": "bool", "required": true },
"cisco_switches": {
Expand Down