x/puppet-midonet
Code Issues Proposed changes

Make contain statements compatible with Puppet 3.6

Browse Source 
`contain` statements with absolute class names (that is, with leading
::) are not supported in Puppet 3.6.x. Also quoted classes do not work
properly.

Change-Id: Ie565e432f7de14eaf6bb2a78f1bba2f1f4e30302
This commit is contained in:
Alejandro Andreu 2016-11-23 12:03:39 +01:00
parent a8255d64a3
commit b23ca827e5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/agent.pp
View File

@ -141,7 +141,7 @@ class midonet::agent (
package_ensure => $package_ensure, package_ensure => $package_ensure,
manage_java => $manage_java, manage_java => $manage_java,
} }
contain 'midonet::agent::install' contain midonet::agent::install
class { 'midonet::agent::run': class { 'midonet::agent::run':
service_name => $service_name, service_name => $service_name,
@ -156,7 +156,7 @@ class midonet::agent (
dhcp_mtu => $dhcp_mtu, dhcp_mtu => $dhcp_mtu,
require => Class['midonet::agent::install'], require => Class['midonet::agent::install'],
} }
contain 'midonet::agent::run' contain midonet::agent::run
if $is_mem { if $is_mem {
if $manage_repo == true { if $manage_repo == true {
@ -171,12 +171,12 @@ class midonet::agent (
mem_password => $mem_password, mem_password => $mem_password,
before => Class['midonet::agent::scrapper'] before => Class['midonet::agent::scrapper']
} }
contain 'midonet::repository' contain midonet::repository
} }
} }
class { 'midonet::agent::scrapper': class { 'midonet::agent::scrapper':
} }
contain 'midonet::agent::scrapper' contain midonet::agent::scrapper
} }
else { else {
notice('Skipping installation of jmx-scrapper') notice('Skipping installation of jmx-scrapper')

4
manifests/cluster.pp
View File

@ -140,7 +140,7 @@ class midonet::cluster (
package_name => $package_name, package_name => $package_name,
is_mem => $is_mem is_mem => $is_mem
} }
contain 'midonet::cluster::install' contain midonet::cluster::install
class { 'midonet::cluster::run': class { 'midonet::cluster::run':
service_name => $service_name, service_name => $service_name,
@ -166,5 +166,5 @@ class midonet::cluster (
package_ensure => $package_ensure, package_ensure => $package_ensure,
require => Class['midonet::cluster::install'] require => Class['midonet::cluster::install']
} }
contain 'midonet::cluster::run' contain midonet::cluster::run
} }