x/fuel-plugin-neutron-vpnaas
Code Issues Proposed changes

Merge "Add timeout for secondary controllers and fix dependency"

Browse Source
This commit is contained in:
Jenkins 2015-02-04 16:05:01 +00:00 committed by Gerrit Code Review
commit 1387fd56b8
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment_scripts/puppet/modules/vpnaas/manifests/common.pp
View File

@ -20,7 +20,7 @@ class vpnaas::common {
enable => true, enable => true,
} }
exec { "enable_vpnaas_dashboard": exec {'enable_vpnaas_dashboard':
command => "/bin/sed -i \"s/'enable_vpn': False/'enable_vpn': True/\" $vpnaas::params::dashboard_settings", command => "/bin/sed -i \"s/'enable_vpn': False/'enable_vpn': True/\" $vpnaas::params::dashboard_settings",
unless => "/bin/egrep \"'enable_vpn': True\" $vpnaas::params::dashboard_settings", unless => "/bin/egrep \"'enable_vpn': True\" $vpnaas::params::dashboard_settings",
} }
@ -36,6 +36,6 @@ class vpnaas::common {
value => 'plugin.VPNDriverPlugin', value => 'plugin.VPNDriverPlugin',
} }
Exec['enable_vpnaas_dashboard'] -> Ini_subsetting['add_vpnaas_service_plugin'] ~> Exec['enable_vpnaas_dashboard'] ~> Service[$vpnaas::params::dashboard_service]
Service[$vpnaas::params::server_service] ~> Service[$vpnaas::params::dashboard_service] Ini_subsetting['add_vpnaas_service_plugin'] ~> Service[$vpnaas::params::server_service]
} }

12
deployment_scripts/puppet/modules/vpnaas/manifests/ha.pp
View File

@ -81,6 +81,18 @@ class vpnaas::ha {
hasrestart => false, hasrestart => false,
} }
#fuel-plugins system doesn't have 'primary-controller' role so
#we have to separate controllers' deployment here using waiting cycles.
if ! $primary_controller {
exec {'waiting-for-vpn-agent':
tries => 30,
try_sleep => 10,
command => "pcs resource show p_neutron-vpn-agent > /dev/null 2>&1",
path => '/usr/sbin:/usr/bin:/sbin:/bin',
}
Exec['waiting-for-vpn-agent'] -> Cluster::Corosync::Cs_service["vpn"]
}
File['q-agent-cleanup.py'] -> Cluster::Corosync::Cs_service["vpn"] File['q-agent-cleanup.py'] -> Cluster::Corosync::Cs_service["vpn"]
File["${vpnaas::params::vpn_agent_ocf_file}"] -> Cluster::Corosync::Cs_service["vpn"] -> File["${vpnaas::params::vpn_agent_ocf_file}"] -> Cluster::Corosync::Cs_service["vpn"] ->
Cluster::Corosync::Cs_with_service['vpn-and-ovs'] -> Class['vpnaas::common'] Cluster::Corosync::Cs_with_service['vpn-and-ovs'] -> Class['vpnaas::common']

38
deployment_scripts/puppet/modules/vpnaas/manifests/params.pp
View File

@ -3,29 +3,24 @@
class vpnaas::params { class vpnaas::params {
if($::osfamily == 'Redhat') { if($::osfamily == 'Redhat') {
$server_package = 'openstack-neutron'
$server_service = 'neutron-server'
$vpnaas_agent_package = 'openstack-neutron-vpn-agent' $server_package = 'openstack-neutron'
$vpnaas_agent_service = 'neutron-vpn-agent'
$openswan_package = 'openswan'
$dashboard_package = 'openstack-dashboard' $vpnaas_agent_package = 'openstack-neutron-vpn-agent'
$dashboard_service = 'httpd'
$dashboard_settings = '/etc/openstack-dashboard/local_settings' $dashboard_package = 'openstack-dashboard'
$dashboard_service = 'httpd'
$dashboard_settings = '/etc/openstack-dashboard/local_settings'
} elsif($::osfamily == 'Debian') { } elsif($::osfamily == 'Debian') {
$server_package = 'neutron-server' $server_package = 'neutron-server'
$server_service = 'neutron-server'
$vpnaas_agent_package = 'neutron-vpn-agent' $vpnaas_agent_package = 'neutron-vpn-agent'
$vpnaas_agent_service = 'neutron-vpn-agent'
$openswan_package = 'openswan'
$dashboard_package = 'python-django-horizon' $dashboard_package = 'python-django-horizon'
$dashboard_service = 'apache2' $dashboard_service = 'apache2'
$dashboard_settings = '/etc/openstack-dashboard/local_settings.py' $dashboard_settings = '/etc/openstack-dashboard/local_settings.py'
} else { } else {
@ -33,7 +28,12 @@ class vpnaas::params {
} }
$ipsec_service = 'ipsec' $ipsec_service = 'ipsec'
$vpn_agent_ocf_file = '/etc/puppet/modules/cluster/files/ocf/neutron-agent-vpn' $server_service = 'neutron-server'
$cleanup_script_file = '/etc/puppet/modules/cluster/files/q-agent-cleanup.py' $vpnaas_agent_service = 'neutron-vpn-agent'
$openswan_package = 'openswan'
$vpn_agent_ocf_file = '/etc/puppet/modules/cluster/files/ocf/neutron-agent-vpn'
$cleanup_script_file = '/etc/puppet/modules/cluster/files/q-agent-cleanup.py'
} }