Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/283371
Change subject: swift/admin: put admin groups in role/common/ files ...................................................................... swift/admin: put admin groups in role/common/ files Trying to put the admin group in ./common/ was wrong and didnt work. We need ./role/common/ and we did not have one common file here yet, it's split up into proxy/storage and esams/eqiad. Bug:T130910 Change-Id: Idd99beecb55cc28b04e4073d626c05b8f7ab22f9 --- M hieradata/common/swift.yaml M hieradata/role/common/swift/eqiad_prod/proxy.yaml M hieradata/role/common/swift/eqiad_prod/storage.yaml M hieradata/role/common/swift/esams_prod/proxy.yaml M hieradata/role/common/swift/esams_prod/storage.yaml 5 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/71/283371/1 diff --git a/hieradata/common/swift.yaml b/hieradata/common/swift.yaml index 5efac28..a1d8f67 100644 --- a/hieradata/common/swift.yaml +++ b/hieradata/common/swift.yaml @@ -1,5 +1,3 @@ -admin::groups: - - swift-roots # used by ferm proxyhosts: - ms-fe1001.eqiad.wmnet diff --git a/hieradata/role/common/swift/eqiad_prod/proxy.yaml b/hieradata/role/common/swift/eqiad_prod/proxy.yaml index 21bef47..2253392 100644 --- a/hieradata/role/common/swift/eqiad_prod/proxy.yaml +++ b/hieradata/role/common/swift/eqiad_prod/proxy.yaml @@ -1,2 +1,4 @@ cluster: swift nagios_group: swift +admin::groups: + - swift-roots diff --git a/hieradata/role/common/swift/eqiad_prod/storage.yaml b/hieradata/role/common/swift/eqiad_prod/storage.yaml index 21bef47..2253392 100644 --- a/hieradata/role/common/swift/eqiad_prod/storage.yaml +++ b/hieradata/role/common/swift/eqiad_prod/storage.yaml @@ -1,2 +1,4 @@ cluster: swift nagios_group: swift +admin::groups: + - swift-roots diff --git a/hieradata/role/common/swift/esams_prod/proxy.yaml b/hieradata/role/common/swift/esams_prod/proxy.yaml index 21bef47..2253392 100644 --- a/hieradata/role/common/swift/esams_prod/proxy.yaml +++ b/hieradata/role/common/swift/esams_prod/proxy.yaml @@ -1,2 +1,4 @@ cluster: swift nagios_group: swift +admin::groups: + - swift-roots diff --git a/hieradata/role/common/swift/esams_prod/storage.yaml b/hieradata/role/common/swift/esams_prod/storage.yaml index 21bef47..2253392 100644 --- a/hieradata/role/common/swift/esams_prod/storage.yaml +++ b/hieradata/role/common/swift/esams_prod/storage.yaml @@ -1,2 +1,4 @@ cluster: swift nagios_group: swift +admin::groups: + - swift-roots -- To view, visit https://gerrit.wikimedia.org/r/283371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd99beecb55cc28b04e4073d626c05b8f7ab22f9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
