[MediaWiki-commits] [Gerrit] operations/puppet[production]: labpuppetmaster: more hiera config

[Andrew Bogott (Code Review)]

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

Change subject: labpuppetmaster:  more hiera config
..


labpuppetmaster:  more hiera config

Change-Id: Ic13b9f41959ce1509c6e60ee0228fbf6c28501fb
---
M hieradata/role/common/labs/puppetmaster/backend.yaml
M hieradata/role/common/labs/puppetmaster/frontend.yaml
2 files changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/labs/puppetmaster/backend.yaml 
b/hieradata/role/common/labs/puppetmaster/backend.yaml
index 22b6980..0a5867d 100644
--- a/hieradata/role/common/labs/puppetmaster/backend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/backend.yaml
@@ -8,6 +8,8 @@
 profile::puppetmaster::backend::secure_private: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
+profile::discovery::path: "/srv/config-master/discovery"
+profile::discovery::watch_interval: 60
 
 profile::puppetmaster::frontend::web_hostname: labs-puppetmaster.wikimedia.org
 profile::puppetmaster::common::storeconfigs: none
diff --git a/hieradata/role/common/labs/puppetmaster/frontend.yaml 
b/hieradata/role/common/labs/puppetmaster/frontend.yaml
index 22b6980..0a5867d 100644
--- a/hieradata/role/common/labs/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/frontend.yaml
@@ -8,6 +8,8 @@
 profile::puppetmaster::backend::secure_private: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
+profile::discovery::path: "/srv/config-master/discovery"
+profile::discovery::watch_interval: 60
 
 profile::puppetmaster::frontend::web_hostname: labs-puppetmaster.wikimedia.org
 profile::puppetmaster::common::storeconfigs: none

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic13b9f41959ce1509c6e60ee0228fbf6c28501fb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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]: labpuppetmaster: more hiera config

[Andrew Bogott (Code Review)]

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

Change subject: labpuppetmaster:  more hiera config
..

labpuppetmaster:  more hiera config

Change-Id: Ic13b9f41959ce1509c6e60ee0228fbf6c28501fb
---
M hieradata/role/common/labs/puppetmaster/backend.yaml
M hieradata/role/common/labs/puppetmaster/frontend.yaml
2 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/368099/1

diff --git a/hieradata/role/common/labs/puppetmaster/backend.yaml 
b/hieradata/role/common/labs/puppetmaster/backend.yaml
index 22b6980..0a5867d 100644
--- a/hieradata/role/common/labs/puppetmaster/backend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/backend.yaml
@@ -8,6 +8,8 @@
 profile::puppetmaster::backend::secure_private: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
+profile::discovery::path: "/srv/config-master/discovery"
+profile::discovery::watch_interval: 60
 
 profile::puppetmaster::frontend::web_hostname: labs-puppetmaster.wikimedia.org
 profile::puppetmaster::common::storeconfigs: none
diff --git a/hieradata/role/common/labs/puppetmaster/frontend.yaml 
b/hieradata/role/common/labs/puppetmaster/frontend.yaml
index 22b6980..0a5867d 100644
--- a/hieradata/role/common/labs/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/frontend.yaml
@@ -8,6 +8,8 @@
 profile::puppetmaster::backend::secure_private: false
 
 profile::conftool::master::sync_dir: "/etc/conftool/data"
+profile::discovery::path: "/srv/config-master/discovery"
+profile::discovery::watch_interval: 60
 
 profile::puppetmaster::frontend::web_hostname: labs-puppetmaster.wikimedia.org
 profile::puppetmaster::common::storeconfigs: none

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic13b9f41959ce1509c6e60ee0228fbf6c28501fb
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