Minor updates to conifgs

perfectsine · perfectsine · commit 5299acbc8845 · 2013-10-24T16:14:37.000-05:00
diff --git a/attributes/neutron.rb b/attributes/neutron.rb
@@ -16,6 +16,7 @@
 default['neutron']['config']['bind_port'] = '9696'
 default['neutron']['config']['auth_strategy'] = 'keystone'
 default['neutron']['config']['agent_down_time'] = '15'
+default['neutron']['config']['ovs_use_veth'] = 'True'
 
 # Neutron quotas
 default['neutron']['config']['default_quota'] = '-1'
@@ -26,7 +27,6 @@
 default['neutron']['config']['quota_security_group_rule'] = '100'
 
 # DHCP agent
-default['neutron']['dhcp_agent']['ovs_use_veth'] = 'True'
 default['neutron']['dhcp_agent']['enable_isolated_metadata'] = 'True'
 default['neutron']['dhcp_agent']['use_namespaces'] = 'True'
 default['neutron']['dhcp_agent']['enable_metadata_network'] = 'True'
diff --git a/providers/keystone.rb b/providers/keystone.rb
@@ -19,7 +19,7 @@
     puts "\nUser #{new_resource.user} was created with ID #{user_id}"
   else
     user_id = shell.stdout.match id_regex
-    if user_id.empty? || user_id.nil?
+    if user_id.size == 0
       raise "ID could not be found.  Check Keystone and retry."
     end
     puts "\nUser #{new_resource.user} already exists with ID #{user_id}"
diff --git a/templates/default/neutron/dhcp_agent.ini.erb b/templates/default/neutron/dhcp_agent.ini.erb
@@ -16,7 +16,7 @@ debug = <%= node['neutron']['config']['debug'] %>
 interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 # OVS based plugins(Ryu, NEC, NVP, BigSwitch/Floodlight) that use OVS
 # as OpenFlow switch and check port status
-ovs_use_veth = <%= node['neutron']['dhcp_agent']['ovs_use_veth'] %>
+ovs_use_veth = <%= node['neutron']['config']['ovs_use_veth'] %>
 # LinuxBridge
 #interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 
diff --git a/templates/default/neutron/l3_agent.ini.erb b/templates/default/neutron/l3_agent.ini.erb
@@ -15,7 +15,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 # Use veth for an OVS interface or not.
 # Support kernels with limited namespace support
 # (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
-# ovs_use_veth = False
+ovs_use_veth = <%= node['neutron']['config']['ovs_use_veth'] %>
 
 # Example of interface_driver option for LinuxBridge
 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
diff --git a/templates/default/neutron/lbaas_agent.ini.erb b/templates/default/neutron/lbaas_agent.ini.erb
@@ -18,7 +18,7 @@ interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 # Use veth for an OVS interface or not.
 # Support kernels with limited namespace support
 # (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
-ovs_use_veth = True
+ovs_use_veth = <%= node['neutron']['config']['ovs_use_veth'] %>
 
 # Example of interface_driver option for LinuxBridge
 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
