x/compass-adapters
Code Issues Proposed changes

fix openstack instance cannot get IP from dhcp

Browse Source 
Change-Id: I073918d34aa99437f964c4ed135f10cf6808b745
This commit is contained in:
grace.yu 2014-09-16 11:12:31 -07:00
parent da9de3c833
commit f335ef85b7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chef/cookbooks/openstack-network/attributes/default.rb
View File

@ -448,6 +448,11 @@ default['openstack']['network']['openvswitch']['fw_driver'] = 'neutron.agent.lin
# It should be false when you use nova security group. # It should be false when you use nova security group.
default['openstack']['network']['openvswitch']['enable_security_group'] = 'True' default['openstack']['network']['openvswitch']['enable_security_group'] = 'True'
# OVS host for GRE tunnel. If bind_interface is set, it will set the host IP of
# this interface, otherwise use default host.
default['openstack']['network']['openvswitch']['host'] = '127.0.0.1'
default['openstack']['network']['openvswitch']['bind_interface'] = nil
# The newest version of OVS which comes with 12.04 Precise is 1.4.0 # The newest version of OVS which comes with 12.04 Precise is 1.4.0
# Which is legacy. Should we compile a newer version from source? # Which is legacy. Should we compile a newer version from source?
# If so, set ['openstack']['network']['openvswitch']['use_source_version'] # If so, set ['openstack']['network']['openvswitch']['use_source_version']

4
chef/cookbooks/openstack-network/recipes/openvswitch.rb
View File

@ -105,14 +105,14 @@ directory '/etc/neutron/plugins/openvswitch' do
only_if { platform_family?('rhel') } only_if { platform_family?('rhel') }
end end
openvswitch_endpoint = endpoint 'network-openvswitch' openvswitch = address node['openstack']['network']['openvswitch']
template '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini' do template '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini' do
source 'plugins/openvswitch/ovs_neutron_plugin.ini.erb' source 'plugins/openvswitch/ovs_neutron_plugin.ini.erb'
owner node['openstack']['network']['platform']['user'] owner node['openstack']['network']['platform']['user']
group node['openstack']['network']['platform']['group'] group node['openstack']['network']['platform']['group']
mode 00644 mode 00644
variables( variables(
local_ip: openvswitch_endpoint.host local_ip: openvswitch
) )
only_if { platform_family?('rhel') } only_if { platform_family?('rhel') }
end end