[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::conftool::client: add default schema

2017-02-27 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/339673 )

Change subject: profile::conftool::client: add default schema
..


profile::conftool::client: add default schema

This first schema is for just discovery objects tjat will be used by our
DNS discovery interface and by MediaWiki to populate
ProductionService.php in mediawiki-config.

Bug: T149617
Change-Id: Iad7d71115142727e0f748d81e39fb3e8b1d2597a
---
A modules/profile/files/conftool/schema.yaml
M modules/profile/manifests/conftool/client.pp
2 files changed, 22 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/files/conftool/schema.yaml 
b/modules/profile/files/conftool/schema.yaml
new file mode 100644
index 000..73ee72c
--- /dev/null
+++ b/modules/profile/files/conftool/schema.yaml
@@ -0,0 +1,13 @@
+# Discovery objects. they will represent a sequence of cluster/service/dc 
combinations
+discovery:
+  path: "discovery"
+  tags:
+- cluster
+- service
+  schema:
+pooled:
+  type: "bool"
+  default: false
+url:
+  type: "string"
+  default: ""
diff --git a/modules/profile/manifests/conftool/client.pp 
b/modules/profile/manifests/conftool/client.pp
index 2a1fcb3..1e617ff 100644
--- a/modules/profile/manifests/conftool/client.pp
+++ b/modules/profile/manifests/conftool/client.pp
@@ -40,4 +40,13 @@
 tcpircbot_port => $tcpircbot_port,
 hosts  => [],
 }
+
+# Conftool schema. Let's assume we will only have one.
+file { '/etc/conftool/schema.yaml':
+ensure => present,
+source => 'puppet:///modules/profile/conftool/schema.yaml',
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad7d71115142727e0f748d81e39fb3e8b1d2597a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Volans 
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::conftool::client: add default schema

2017-02-24 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339673 )

Change subject: profile::conftool::client: add default schema
..

profile::conftool::client: add default schema

This first schema is for just discovery objects tjat will be used by our
DNS discovery interface and by MediaWiki to populate
ProductionService.php in mediawiki-config.

Bug: T149617
Change-Id: Iad7d71115142727e0f748d81e39fb3e8b1d2597a
---
A modules/profile/files/conftool/schema.yaml
M modules/profile/manifests/conftool/client.pp
2 files changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/339673/1

diff --git a/modules/profile/files/conftool/schema.yaml 
b/modules/profile/files/conftool/schema.yaml
new file mode 100644
index 000..73ee72c
--- /dev/null
+++ b/modules/profile/files/conftool/schema.yaml
@@ -0,0 +1,13 @@
+# Discovery objects. they will represent a sequence of cluster/service/dc 
combinations
+discovery:
+  path: "discovery"
+  tags:
+- cluster
+- service
+  schema:
+pooled:
+  type: "bool"
+  default: false
+url:
+  type: "string"
+  default: ""
diff --git a/modules/profile/manifests/conftool/client.pp 
b/modules/profile/manifests/conftool/client.pp
index 2a1fcb3..1e617ff 100644
--- a/modules/profile/manifests/conftool/client.pp
+++ b/modules/profile/manifests/conftool/client.pp
@@ -40,4 +40,13 @@
 tcpircbot_port => $tcpircbot_port,
 hosts  => [],
 }
+
+# Conftool schema. Let's assume we will only have one.
+file { '/etc/conftool/schema.yaml':
+ensure => present,
+source => 'puppet:///modules/profile/conftool/schema.yaml',
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad7d71115142727e0f748d81e39fb3e8b1d2597a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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