Added support for lbaas and firewall service. Fix for merge conflict on horizon.

perfectsine · perfectsine · commit 2abc66ac4f4f · 2013-10-22T10:51:03.000-05:00
diff --git a/recipes/dashboard.rb b/recipes/dashboard.rb
@@ -25,11 +25,11 @@
   action :purge
 end
 
-template '/etc/openstack-dashboard/local_settings.py' do
-  source 'horizon/local_settings.py.erb'
+template '/etc/apache2/conf-available/openstack-dashboard.conf' do
+  source 'horizon/openstack-dashboard.conf.erb'
   owner 'root'
   group 'root'
-  mode 00644
+  mode 00755
   notifies :restart, resources(:service => 'apache2')
   notifies :restart, resources(:service => 'memcached')
 end
diff --git a/recipes/neutron-common.rb b/recipes/neutron-common.rb
@@ -1,7 +1,11 @@
 prereq_packages = %w[openvswitch-datapath-dkms]
 common_packages = %w[openvswitch-switch
-                     neutron-plugin-openvswitch-agent]
-
+                     neutron-plugin-openvswitch-agent
+                     neutron-lbaas-agent
+                     haproxy]
+network_services = %w[openvswitch-switch
+                      neutron-plugin-openvswitch-agent
+                      neutron-lbaas-agent]
 
 prereq_packages.each do |pkg|
   package prereq_packages.join(' ') do
@@ -15,17 +19,13 @@
   end
 end
 
-service 'openvswitch-switch' do
-  supports :status => true, :restart => true, :reload => true
-  action :nothing
-end
-
-service 'neutron-plugin-openvswitch-agent' do
-  provider Chef::Provider::Service::Upstart
-  action :nothing
+network_services.each do |srv|
+  service srv do
+    provider Chef::Provider::Service::Upstart
+    action :nothing
+  end
 end
 
-
 template 'neutron network node OVS config' do
   path '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini'
   owner 'root'
@@ -40,6 +40,14 @@
            :immediately
 end
 
+template '/etc/neutron/lbaas_agent.ini' do
+  source 'neutron/lbaas_agent.ini.erb'
+  owner 'root'
+  group 'root'
+  mode '0644'
+  notifies :restart, resources(:service => 'neutron-lbaas-agent')
+end
+
 bash 'create external bridge' do
   not_if('ovs-vsctl list-br | grep br-ex')
   code <<-CODE
diff --git a/recipes/neutron-controller.rb b/recipes/neutron-controller.rb
@@ -1,4 +1,4 @@
-%w[neutron-server].each do |pkg|
+%w[neutron-server python-neutronclient].each do |pkg|
   package pkg do
     action :install
   end
diff --git a/recipes/neutron-network.rb b/recipes/neutron-network.rb
@@ -1,15 +1,10 @@
 packages = %w[neutron-l3-agent
               neutron-dhcp-agent
-              neutron-metadata-agent
-              neutron-plugin-openvswitch-agent
-              neutron-lbaas-agent]
+              neutron-metadata-agent]
 
-network_services = %w[openvswitch-switch
-                      neutron-plugin-openvswitch-agent
-                      neutron-dhcp-agent
+network_services = %w[neutron-dhcp-agent
                       neutron-l3-agent
-                      neutron-metadata-agent
-                      neutron-lbaas-agent]
+                      neutron-metadata-agent]
 
 packages.each do |pkg|
   package pkg do
diff --git a/templates/default/neutron/lbaas_agent.ini.erb b/templates/default/neutron/lbaas_agent.ini.erb
@@ -18,13 +18,14 @@ 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 = True
 
 # Example of interface_driver option for LinuxBridge
 # interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
 
 # The agent requires a driver to manage the loadbalancer.  HAProxy is the
 # opensource version.
-device_driver = neutron.plugins.services.agent_loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
+#device_driver = neutron.plugins.services.agent_loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
+device_driver = neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
 # The user group
 # user_group = nogroup
diff --git a/templates/default/neutron/neutron.conf.erb b/templates/default/neutron/neutron.conf.erb
@@ -51,7 +51,7 @@ bind_port = <%= node['neutron']['config']['bind_port'] %>
 core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
 
 # Advanced service modules
-#service_plugins = neutron.services.loadbalancer.plugin.LoadBalancerPlugin  #, neutron.services.firewall.fwaas_plugin.FirewallPlugin
+service_plugins = neutron.services.loadbalancer.plugin.LoadBalancerPlugin, neutron.services.firewall.fwaas_plugin.FirewallPlugin
 # Paste configuration file
 #api_paste_config = api-paste.ini
 
@@ -383,5 +383,5 @@ connection = mysql://<%= node['neutron']['db']['name'] %>:<%= node['neutron']['d
 # example of non-default provider:
 # service_provider=FIREWALL:name2:firewall_driver_path
 # --- Reference implementations ---
-#service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
+service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
 #service_provider=FIREWALL:Iptables:neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver:default

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%w[neutron-server].each do \|pkg\|`
	`1`	`+%w[neutron-server python-neutronclient].each do \|pkg\|`
`2`	`2`	`package pkg do`
`3`	`3`	`action :install`
`4`	`4`	`end`