Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: fix credentials #2
......................................................................
swift: fix credentials #2
also write accounts in sorted order
Change-Id: I7f0b9cb5fc6cef641152a61442ff330e0c79066c
---
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/stats/stats_account.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index e2ba2bb..19b3b38 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -21,7 +21,7 @@
require => $required_packages,
}
- $account_names = keys($accounts)
+ $account_names = sorted(keys($accounts))
swift_new::stats::stats_account { $account_names:
accounts => $accounts,
statsd_prefix => $statsd_prefix,
diff --git a/modules/swift_new/manifests/stats/stats_account.pp
b/modules/swift_new/manifests/stats/stats_account.pp
index b79786f..b8c994b 100644
--- a/modules/swift_new/manifests/stats/stats_account.pp
+++ b/modules/swift_new/manifests/stats/stats_account.pp
@@ -7,7 +7,7 @@
$account_info = $accounts[$name]
$auth_url = $account_info[auth]
$user = $account_info[user]
- $key = $credentials[user]
+ $key = $credentials[$name]
$account_name = $account_info[account_name]
$account_file = "/etc/swift/account_${account_name}.env"
--
To view, visit https://gerrit.wikimedia.org/r/164557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f0b9cb5fc6cef641152a61442ff330e0c79066c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
