x
/
puppet-midonet
Code Issues Proposed changes

Merge "Ensure there are no duplicated file declarations"

This commit is contained in:
Jenkins 2017-01-31 14:15:06 +00:00 committed by Gerrit Code Review
parent f6a54c6a1d 3c9cda21d9
commit 0300844c04
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/analytics/quickstart.pp
View File

@ -42,14 +42,16 @@ class midonet::analytics::quickstart (
$config_path = '/etc/midonet/midonet.conf',
) {
file { 'midonet folder':
ensure => 'directory',
path => '/etc/midonet',
owner => 'root',
mode => '0755',
if !defined(File['midonet folder']) {
file { 'midonet folder':
ensure => 'directory',
path => '/etc/midonet',
owner => 'root',
mode => '0755',
}
}
if !defined(File['set_config']) {
if !defined(File['set_config']) {
file { 'set_config':
ensure => present,
path => $config_path,

16
manifests/cluster/run.pp
View File

@ -205,13 +205,15 @@ class midonet::cluster::run (
exec { '/bin/bash /tmp/mn-cluster_config.sh': }
file { 'set_config':
ensure => present,
path => $cluster_config_path,
content => template('midonet/cluster/midonet.conf.erb'),
require => Package['midonet-cluster'],
notify => Service['midonet-cluster'],
before => File['/tmp/mn-cluster_config.sh'],
if !defined(File['set_config']) {
file { 'set_config':
ensure => present,
path => $cluster_config_path,
content => template('midonet/cluster/midonet.conf.erb'),
require => Package['midonet-cluster'],
notify => Service['midonet-cluster'],
before => File['/tmp/mn-cluster_config.sh'],
}
}
file { 'cluster_jvm_config':