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

Merge "Fix puppet lint warnings"

This commit is contained in:
Jenkins 2015-03-19 10:32:53 +00:00 committed by Gerrit Code Review
parent 6755a3ec59 f3a4234745
commit 6796078df3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment_scripts/puppet/modules/fwaas/manifests/init.pp
View File

@ -37,9 +37,10 @@ class fwaas::enable_in_dashboard {
enable => true, enable => true,
} }
exec { 'enable_fwaas_dashboard': exec { 'enable_fwaas_dashboard':
command => "/bin/sed -i \"s/'enable_firewall': False/'enable_firewall': True/\" $fwaas::params::dashboard_settings", command => "/bin/sed -i \"s/'enable_firewall': False/'enable_firewall': True/\" ${fwaas::params::dashboard_settings}",
unless => "/bin/egrep \"'enable_firewall': True\" $fwaas::params::dashboard_settings", unless => "/bin/egrep \"'enable_firewall': True\" ${fwaas::params::dashboard_settings}",
} }
Exec['enable_fwaas_dashboard'] ~> Service[$fwaas::params::dashboard_service] Exec['enable_fwaas_dashboard'] ~> Service[$fwaas::params::dashboard_service]
@ -56,8 +57,8 @@ class fwaas {
if $fwaas::params::ha { if $fwaas::params::ha {
service {$fwaas::params::p_l3_agent: service {$fwaas::params::p_l3_agent:
enable => true,
ensure => running, ensure => running,
enable => true,
provider => 'pacemaker', provider => 'pacemaker',
subscribe => Class[fwaas::enable_in_neutron_config], subscribe => Class[fwaas::enable_in_neutron_config],
} }
@ -65,8 +66,8 @@ class fwaas {
} else { } else {
service {$fwaas::params::l3_agent_service: service {$fwaas::params::l3_agent_service:
enable => true,
ensure => running, ensure => running,
enable => true,
subscribe => Class[fwaas::enable_in_neutron_config], subscribe => Class[fwaas::enable_in_neutron_config],
} }