Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344386 )
Change subject: Remove obsolete Hiera settings
......................................................................
Remove obsolete Hiera settings
timesyncd is now used unconditionally.
Change-Id: I6952a141f8d3444ca28cf7d3705b3b268effb283
---
M hieradata/hosts/multatuli.yaml
D hieradata/hosts/stat1001.yaml
M hieradata/role/codfw/mediawiki/appserver.yaml
M hieradata/role/codfw/mediawiki/canary_appserver.yaml
M hieradata/role/esams/swift/proxy.yaml
M hieradata/role/esams/swift/storage.yaml
M hieradata/role/ulsfo/cache/maps.yaml
M hieradata/role/ulsfo/cache/misc.yaml
M hieradata/role/ulsfo/cache/text.yaml
M hieradata/role/ulsfo/cache/upload.yaml
10 files changed, 0 insertions(+), 10 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/multatuli.yaml b/hieradata/hosts/multatuli.yaml
index 6bb1d38..9fe793e 100644
--- a/hieradata/hosts/multatuli.yaml
+++ b/hieradata/hosts/multatuli.yaml
@@ -1,2 +1 @@
-use_timesyncd: true
apt::use_experimental: true
diff --git a/hieradata/hosts/stat1001.yaml b/hieradata/hosts/stat1001.yaml
deleted file mode 100644
index 832a86c..0000000
--- a/hieradata/hosts/stat1001.yaml
+++ /dev/null
@@ -1 +0,0 @@
-use_timesyncd: true
diff --git a/hieradata/role/codfw/mediawiki/appserver.yaml
b/hieradata/role/codfw/mediawiki/appserver.yaml
index 1ac2c1c..9393bfc 100644
--- a/hieradata/role/codfw/mediawiki/appserver.yaml
+++ b/hieradata/role/codfw/mediawiki/appserver.yaml
@@ -1,4 +1,3 @@
debdeploy::grains:
debdeploy-appserver-codfw:
value: standard
-use_timesyncd: true
diff --git a/hieradata/role/codfw/mediawiki/canary_appserver.yaml
b/hieradata/role/codfw/mediawiki/canary_appserver.yaml
index 670cde1..7520559 100644
--- a/hieradata/role/codfw/mediawiki/canary_appserver.yaml
+++ b/hieradata/role/codfw/mediawiki/canary_appserver.yaml
@@ -1,2 +1 @@
role::mediawiki::webserver::tls: true
-use_timesyncd: true
diff --git a/hieradata/role/esams/swift/proxy.yaml
b/hieradata/role/esams/swift/proxy.yaml
index 4d98691..52add8d 100644
--- a/hieradata/role/esams/swift/proxy.yaml
+++ b/hieradata/role/esams/swift/proxy.yaml
@@ -5,4 +5,3 @@
value: standard
admin::groups:
- swift-roots
-use_timesyncd: true
diff --git a/hieradata/role/esams/swift/storage.yaml
b/hieradata/role/esams/swift/storage.yaml
index e33a590..0d01593 100644
--- a/hieradata/role/esams/swift/storage.yaml
+++ b/hieradata/role/esams/swift/storage.yaml
@@ -3,4 +3,3 @@
value: standard
admin::groups:
- swift-roots
-use_timesyncd: true
diff --git a/hieradata/role/ulsfo/cache/maps.yaml
b/hieradata/role/ulsfo/cache/maps.yaml
index 5447792..48da31a 100644
--- a/hieradata/role/ulsfo/cache/maps.yaml
+++ b/hieradata/role/ulsfo/cache/maps.yaml
@@ -1,4 +1,3 @@
debdeploy::grains:
debdeploy-cp-ulsfo-maps:
value: standard
-use_timesyncd: true
diff --git a/hieradata/role/ulsfo/cache/misc.yaml
b/hieradata/role/ulsfo/cache/misc.yaml
index e7941db..8e8cb74 100644
--- a/hieradata/role/ulsfo/cache/misc.yaml
+++ b/hieradata/role/ulsfo/cache/misc.yaml
@@ -1,4 +1,3 @@
debdeploy::grains:
debdeploy-cp-ulsfo-misc:
value: standard
-use_timesyncd: true
diff --git a/hieradata/role/ulsfo/cache/text.yaml
b/hieradata/role/ulsfo/cache/text.yaml
index 915c946..fcaa704 100644
--- a/hieradata/role/ulsfo/cache/text.yaml
+++ b/hieradata/role/ulsfo/cache/text.yaml
@@ -1,4 +1,3 @@
debdeploy::grains:
debdeploy-cp-ulsfo-text:
value: standard
-use_timesyncd: true
diff --git a/hieradata/role/ulsfo/cache/upload.yaml
b/hieradata/role/ulsfo/cache/upload.yaml
index 6d2b150..4ee386e 100644
--- a/hieradata/role/ulsfo/cache/upload.yaml
+++ b/hieradata/role/ulsfo/cache/upload.yaml
@@ -1,4 +1,3 @@
debdeploy::grains:
debdeploy-cp-ulsfo-upload:
value: standard
-use_timesyncd: true
--
To view, visit https://gerrit.wikimedia.org/r/344386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6952a141f8d3444ca28cf7d3705b3b268effb283
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
