arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed bug3890. When there are two interfaces(pubinterface and mgtinterface) on the controller node,

Browse Source 
There are something wrong with the cookbooks. fixed it
This commit is contained in:
jjhua 2013-11-12 15:31:50 -05:00
parent 1bf4253477
commit 3b18b981c5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xCAT-OpenStack/chef-cookbooks/grizzly-xcat/cookbooks/openstack-network/recipes/common.rb
View File

@ -120,11 +120,16 @@ else
bind_port = node["openstack"]["network"]["api"]["bind_port"]
end
# retrieve the local interface for tunnels
if node["openstack"]["network"]["openvswitch"]["local_ip_interface"].nil?
local_ip = node["openstack"]["network"]["openvswitch"]["local_ip"]
network_server_role = node["openstack"]["network"]["network_server_chef_role"]
if node.run_list.roles.include?(network_server_role)
local_ip="{}"
else
local_ip = address_for node["openstack"]["network"]["openvswitch"]["local_ip_interface"]
# retrieve the local interface for tunnels
if node["openstack"]["network"]["openvswitch"]["local_ip_interface"].nil?
local_ip = node["openstack"]["network"]["openvswitch"]["local_ip"]
else
local_ip = address_for node["openstack"]["network"]["openvswitch"]["local_ip_interface"]
end
end
platform_options["quantum_client_packages"].each do |pkg|

1
xCAT-OpenStack/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
View File

@ -109,6 +109,7 @@ override_attributes(
"use_ssl" => "false"
},
"network" => {
"network_server_chef_role" => "os-single-controller",
"metadata"=>{
"nova_metadata_ip"=>"#TABLE:clouds:name=$CLOUD:hostip#"
},