Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/344583 )
Change subject: role::puppet_compiler: fix broken inclusion of a removed class
......................................................................
role::puppet_compiler: fix broken inclusion of a removed class
Change-Id: I40d88c2c02115b94b1385d0b879d8a7c38ecb4a5
---
M modules/puppet_compiler/manifests/init.pp
M modules/role/manifests/puppet_compiler.pp
2 files changed, 9 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/344583/1
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index 81664bc..e9ee9c3 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -84,18 +84,9 @@
# The conftool parser function needs
- # - the conftool module to be included
- # - An etcd instance running populated with (fake? synced?) data
+ # An etcd instance running populated with (fake? synced?) data
include ::etcd
-
- class { '::conftool':
- use_ssl => false,
- auth => false,
- hosts => [
- 'http://127.0.0.1:2379',
- ],
- }
tidy { "${::puppet_compiler::workdir}/output":
recurse => true,
diff --git a/modules/role/manifests/puppet_compiler.pp
b/modules/role/manifests/puppet_compiler.pp
index 98a88e5..0567daa 100644
--- a/modules/role/manifests/puppet_compiler.pp
+++ b/modules/role/manifests/puppet_compiler.pp
@@ -19,4 +19,12 @@
include ::puppet_compiler
+ # Conftool + etcd are needed for the conftool function to work
+ # do not bother with hiera here, for now.
+ class { '::profile::conftool::client':
+ srv_domain => undef,
+ host => '127.0.0.1',
+ port => 2379,
+ namespace => '/conftool/v1',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/344583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40d88c2c02115b94b1385d0b879d8a7c38ecb4a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
