Skip to content

Commit b030d82

Browse files
perfectsineperfectsine
committed
Minor fixes and editing. Adding support for load balance and firewall service providers.
1 parent 39f52fc commit b030d82

10 files changed

Lines changed: 82 additions & 136 deletions

File tree

‎recipes/dashboard.rb‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,16 @@
2929
source 'horizon/local_settings.py.erb'
3030
owner 'root'
3131
group 'root'
32-
mode 00644
33-
notifies :restart, resources(:service => 'apache2'), :immediately
34-
notifies :restart, resources(:service => 'memcached'), :immediately
32+
mode 00644
33+
notifies :restart, resources(:service => 'apache2')
34+
notifies :restart, resources(:service => 'memcached')
35+
end
36+
37+
template '/etc/openstack-dashboard/local_settings.py' do
38+
source 'horizon/local_settings.py.erb'
39+
owner 'root'
40+
group 'root'
41+
mode 00644
42+
notifies :restart, resources(:service => 'apache2'), :immediately
43+
notifies :restart, resources(:service => 'memcached'), :immediately
3544
end

‎recipes/keystone.rb‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,20 +89,26 @@
8989
mode 00755
9090
recursive true
9191
action :create
92+
notifies :stop, "service[keystone]"
93+
notifies :restart, "service[apache2]"
9294
end
9395

9496
template '/usr/share/keystone/wsgi/main' do
9597
source 'keystone/keystone.py'
9698
owner 'root'
9799
group 'root'
98100
mode 00644
101+
notifies :stop, "service[keystone]"
102+
notifies :restart, "service[apache2]"
99103
end
100104

101105
template '/usr/share/keystone/wsgi/admin' do
102106
source 'keystone/keystone.py'
103107
owner 'root'
104108
group 'root'
105109
mode 00644
110+
notifies :stop, "service[keystone]"
111+
notifies :restart, "service[apache2]"
106112
end
107113

108114
directory '/var/log/keystone' do
@@ -131,6 +137,7 @@
131137
owner 'root'
132138
group 'root'
133139
mode 00644
140+
notifies :restart, resources(:service => 'keystone'), :immediately
134141
notifies :restart, resources(:service => 'apache2'), :immediately
135142
end
136143

‎recipes/neutron-controller.rb‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%w[neutron-server haproxy].each do |pkg|
1+
%w[neutron-server].each do |pkg|
22
package pkg do
33
action :install
44
end
@@ -41,11 +41,3 @@
4141
source 'neutron/neutron.conf.erb'
4242
notifies :restart, resources(:service => 'neutron-server'), :immediately
4343
end
44-
45-
# bash 'Enable the controller OVS plugin' do
46-
# not_if {File.symlink?('/etc/neutron/plugin.ini')}
47-
# code <<-CODE
48-
# ln -s /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini \
49-
# /etc/neutron/plugin.ini
50-
# CODE
51-
# end

‎recipes/neutron-network.rb‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,21 @@
4141
notifies :restart, resources(:service => 'neutron-dhcp-agent')
4242
end
4343

44+
notifies :restart, resources(:service => 'neutron-metadata-agent')
45+
template '/etc/neutron/lbaas_agent.ini' do
46+
source 'neutron/lbaas_agent.ini.erb'
47+
owner 'root'
48+
group 'root'
49+
mode '0644'
50+
notifies :restart, resources(:service => 'neutron-lbaas-agent')
51+
end
52+
4453
template '/etc/neutron/metadata_agent.ini' do
45-
owner 'root'
46-
group 'neutron'
47-
mode '0644'
48-
source 'neutron/metadata_agent.ini.erb'
49-
notifies :restart, resources(:service => 'neutron-metadata-agent')
54+
owner 'root'
55+
group 'neutron'
56+
mode '0644'
57+
source 'neutron/metadata_agent.ini.erb'
58+
notifies :restart, resources(:service => 'neutron-metadata-agent')
5059
end
5160

5261
template '/etc/neutron/l3_agent.ini' do

‎templates/default/horizon/local_settings.py.erb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ OPENSTACK_HYPERVISOR_FEATURES = {
162162
# services provided by neutron. Options currenly available are load
163163
# balancer service, security groups, quotas, VPN service.
164164
OPENSTACK_NEUTRON_NETWORK = {
165-
'enable_lb': False,
166-
'enable_firewall': False,
165+
'enable_lb': True,
166+
'enable_firewall': True,
167167
'enable_quotas': True,
168168
'enable_vpn': False,
169169
# The profile_support option is used to detect if an external router can be
@@ -458,8 +458,8 @@ except ImportError:
458458

459459
# Default Ubuntu apache configuration uses /horizon as the application root.
460460
# Configure auth redirects here accordingly.
461-
LOGIN_URL='/horizon/auth/login/'
462-
LOGIN_REDIRECT_URL='/horizon'
461+
LOGIN_URL='/auth/login/'
462+
LOGIN_REDIRECT_URL='/'
463463

464464
# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
465465
# offline compression by default. To enable online compression, install

‎templates/default/horizon/openstack-dashboard.conf.erb‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
2+
WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10
3+
WSGIProcessGroup horizon
4+
Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
5+
<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
6+
Order allow,deny
7+
Allow from all
8+
</Directory>

‎templates/default/keystone/wsgi-keystone.conf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ NameVirtualHost *:<%= node["keystone"]["config"]["public_port"] %>
1010
Order deny,allow
1111
Allow from all
1212
</Directory>
13+
CustomLog /var/log/apache2/keystone-main-access.log vhost_combined
14+
ErrorLog /var/log/apache2/keystone-main-error.log
1315
</VirtualHost>
1416

1517

@@ -24,4 +26,6 @@ NameVirtualHost *:<%= node["keystone"]["config"]["admin_port"] %>
2426
Order deny,allow
2527
Allow from all
2628
</Directory>
27-
</VirtualHost>
29+
CustomLog /var/log/apache2/keystone-admin-access.log vhost_combined
30+
ErrorLog /var/log/apache2/keystone-admin-error.log
31+
</VirtualHost>

‎templates/default/neutron/lbaas_agent.ini.erb‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[DEFAULT]
2+
# Show debugging output in log (sets DEBUG log level output).
3+
# debug = False
4+
5+
# The LBaaS agent will resync its state with Neutron to recover from any
6+
# transient notification or rpc errors. The interval is number of
7+
# seconds between attempts.
8+
# periodic_interval = 10
9+
10+
# LBaas requires an interface driver be set. Choose the one that best
11+
# matches your plugin.
12+
# interface_driver =
13+
14+
# Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP,
15+
# BigSwitch/Floodlight)
16+
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
17+
18+
# Use veth for an OVS interface or not.
19+
# Support kernels with limited namespace support
20+
# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
21+
# ovs_use_veth = False
22+
23+
# Example of interface_driver option for LinuxBridge
24+
# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
25+
26+
# The agent requires a driver to manage the loadbalancer. HAProxy is the
27+
# opensource version.
28+
device_driver = neutron.plugins.services.agent_loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
29+
# The user group
30+
# user_group = nogroup

‎templates/default/neutron/neutron.conf.erb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ bind_port = <%= node['neutron']['config']['bind_port'] %>
5151
core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
5252

5353
# Advanced service modules
54-
# service_plugins = neutron.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin, neutron.services.firewall.fwaas_plugin.FirewallPlugin
55-
54+
#service_plugins = neutron.services.loadbalancer.plugin.LoadBalancerPlugin #, neutron.services.firewall.fwaas_plugin.FirewallPlugin
5655
# Paste configuration file
5756
#api_paste_config = api-paste.ini
5857

‎templates/default/neutron/openvswitch.conf‎

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)