[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::puppetmaster::common: Always enable environments

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393677 )

Change subject: profile::puppetmaster::common: Always enable environments
..


profile::puppetmaster::common: Always enable environments

Now that everything is using the future parser, we want
this everywhere as a prelude to the puppet 4 switch.

Change-Id: Ic96b4f33265fa3653aca4c3c0ee7faa381ab513e
---
M hieradata/role/common/puppetmaster/backend.yaml
M hieradata/role/common/puppetmaster/frontend.yaml
M modules/profile/manifests/puppetmaster/common.pp
3 files changed, 3 insertions(+), 12 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/puppetmaster/backend.yaml 
b/hieradata/role/common/puppetmaster/backend.yaml
index eee065a..eb833db 100644
--- a/hieradata/role/common/puppetmaster/backend.yaml
+++ b/hieradata/role/common/puppetmaster/backend.yaml
@@ -7,5 +7,4 @@
   - esams.wmnet
   - ulsfo.wmnet
 cluster: puppet
-profile::puppetmaster::common::directory_environments: true
 profile::puppetmaster::common::storeconfigs: puppetdb
diff --git a/hieradata/role/common/puppetmaster/frontend.yaml 
b/hieradata/role/common/puppetmaster/frontend.yaml
index a65135f..8438f89 100644
--- a/hieradata/role/common/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/puppetmaster/frontend.yaml
@@ -15,5 +15,4 @@
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 profile::discovery::path: "/srv/config-master/discovery"
 profile::discovery::watch_interval: 60
-profile::puppetmaster::common::directory_environments: true
 profile::puppetmaster::common::storeconfigs: puppetdb
diff --git a/modules/profile/manifests/puppetmaster/common.pp 
b/modules/profile/manifests/puppetmaster/common.pp
index d18ffe6..53ad831 100644
--- a/modules/profile/manifests/puppetmaster/common.pp
+++ b/modules/profile/manifests/puppetmaster/common.pp
@@ -3,24 +3,17 @@
 # $config:  Dict merged with front- or back- specifics and then passed
 #   to ::puppetmaster as $config
 #
-# $directory_environments: boolean, when True adds boilerplate environment 
config
-#
 # $storeconfigs: Accepts values of 'puppetdb', 'activerecord', and 'none'
 
 class profile::puppetmaster::common (
 $base_config,
-$directory_environments = 
hiera('profile::puppetmaster::common::directory_environments', false),
 $storeconfigs = hiera('profile::puppetmaster::common::storeconfigs', 
'activerecord'),
 ) {
 include passwords::puppet::database
 
-if $directory_environments {
-$env_config = {
-'environmentpath' => '$confdir/environments',
-'default_manifest' => '$confdir/manifests/site.pp'
-}
-} else {
-$env_config = {}
+$env_config = {
+'environmentpath' => '$confdir/environments',
+'default_manifest' => '$confdir/manifests/site.pp'
 }
 
 $activerecord_config =   {

-- 
To view, visit https://gerrit.wikimedia.org/r/393677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic96b4f33265fa3653aca4c3c0ee7faa381ab513e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::puppetmaster::common: Always enable environments

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393677 )

Change subject: profile::puppetmaster::common: Always enable environments
..

profile::puppetmaster::common: Always enable environments

This was switchable via hiera but is switched on in all production
cases.  It was switched off on labpuppetmaster* which as far
as I can tell was a mistake.

Since having this be configurable just makes it easy to overlook,
let's just turn it on.

Change-Id: Ic96b4f33265fa3653aca4c3c0ee7faa381ab513e
---
M hieradata/role/common/puppetmaster/backend.yaml
M hieradata/role/common/puppetmaster/frontend.yaml
M modules/profile/manifests/puppetmaster/common.pp
3 files changed, 3 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/393677/1

diff --git a/hieradata/role/common/puppetmaster/backend.yaml 
b/hieradata/role/common/puppetmaster/backend.yaml
index eee065a..eb833db 100644
--- a/hieradata/role/common/puppetmaster/backend.yaml
+++ b/hieradata/role/common/puppetmaster/backend.yaml
@@ -7,5 +7,4 @@
   - esams.wmnet
   - ulsfo.wmnet
 cluster: puppet
-profile::puppetmaster::common::directory_environments: true
 profile::puppetmaster::common::storeconfigs: puppetdb
diff --git a/hieradata/role/common/puppetmaster/frontend.yaml 
b/hieradata/role/common/puppetmaster/frontend.yaml
index a65135f..8438f89 100644
--- a/hieradata/role/common/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/puppetmaster/frontend.yaml
@@ -15,5 +15,4 @@
 profile::conftool::master::sync_dir: "/etc/conftool/data"
 profile::discovery::path: "/srv/config-master/discovery"
 profile::discovery::watch_interval: 60
-profile::puppetmaster::common::directory_environments: true
 profile::puppetmaster::common::storeconfigs: puppetdb
diff --git a/modules/profile/manifests/puppetmaster/common.pp 
b/modules/profile/manifests/puppetmaster/common.pp
index d18ffe6..53ad831 100644
--- a/modules/profile/manifests/puppetmaster/common.pp
+++ b/modules/profile/manifests/puppetmaster/common.pp
@@ -3,24 +3,17 @@
 # $config:  Dict merged with front- or back- specifics and then passed
 #   to ::puppetmaster as $config
 #
-# $directory_environments: boolean, when True adds boilerplate environment 
config
-#
 # $storeconfigs: Accepts values of 'puppetdb', 'activerecord', and 'none'
 
 class profile::puppetmaster::common (
 $base_config,
-$directory_environments = 
hiera('profile::puppetmaster::common::directory_environments', false),
 $storeconfigs = hiera('profile::puppetmaster::common::storeconfigs', 
'activerecord'),
 ) {
 include passwords::puppet::database
 
-if $directory_environments {
-$env_config = {
-'environmentpath' => '$confdir/environments',
-'default_manifest' => '$confdir/manifests/site.pp'
-}
-} else {
-$env_config = {}
+$env_config = {
+'environmentpath' => '$confdir/environments',
+'default_manifest' => '$confdir/manifests/site.pp'
 }
 
 $activerecord_config =   {

-- 
To view, visit https://gerrit.wikimedia.org/r/393677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic96b4f33265fa3653aca4c3c0ee7faa381ab513e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits