Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333289 )
Change subject: Follow-up I94eb86ba: Ignore projects where we can't list
instances
......................................................................
Follow-up I94eb86ba: Ignore projects where we can't list instances
E.g. the admin project
Bug: T104575
Change-Id: I6b158f999a5adbe9e5d6bba59a5d4ae9190afa8b
---
M modules/graphite/files/archive-instances
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/graphite/files/archive-instances
b/modules/graphite/files/archive-instances
index 2745754..649b5e5 100755
--- a/modules/graphite/files/archive-instances
+++ b/modules/graphite/files/archive-instances
@@ -22,6 +22,7 @@
from keystoneclient.session import Session as KeystoneSession
from keystoneclient.auth.identity.v3 import Password as KeystonePassword
from keystoneclient.client import Client as KeystoneClient
+from keystoneclient.exceptions import Unauthorized as
KeystoneUnauthorisedException
from novaclient import client as novaclient
@@ -104,7 +105,10 @@
deleted_hosts = {}
for project in projects:
hosts_with_metrics = get_hosts_with_metrics(project)
- actual_hosts = get_hosts_for_project(project)
+ try:
+ actual_hosts = get_hosts_for_project(project)
+ except KeystoneUnauthorisedException:
+ continue
deleted = set(hosts_with_metrics) - set(actual_hosts)
if deleted:
deleted_hosts[project] = deleted
--
To view, visit https://gerrit.wikimedia.org/r/333289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b158f999a5adbe9e5d6bba59a5d4ae9190afa8b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
