Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345886 )
Change subject: labs-ip-alias-dump.py: Use keystone api v3
......................................................................
labs-ip-alias-dump.py: Use keystone api v3
Bug: T158650
Change-Id: Iff2526edfb659229e6e0f10acfbe043c8465557b
---
M modules/dnsrecursor/files/labs-ip-alias-dump.py
M modules/role/manifests/labs/dnsrecursor.pp
2 files changed, 26 insertions(+), 20 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dnsrecursor/files/labs-ip-alias-dump.py
b/modules/dnsrecursor/files/labs-ip-alias-dump.py
index 3f5a8f2..a9c059d 100644
--- a/modules/dnsrecursor/files/labs-ip-alias-dump.py
+++ b/modules/dnsrecursor/files/labs-ip-alias-dump.py
@@ -5,11 +5,13 @@
import argparse
import itertools
-from keystoneclient.session import Session as KeystoneSession
-from keystoneclient.auth.identity.v2 import Password as KeystonePassword
-from keystoneclient.client import Client as KeystoneClient
+from keystoneclient.auth.identity import generic
+from keystoneclient import session as keystone_session
+
+from keystoneclient.v3 import client as keystone_client
from novaclient import client as novaclient
+
argparser = argparse.ArgumentParser()
argparser.add_argument(
@@ -29,28 +31,32 @@
args = argparser.parse_args()
config = yaml.safe_load(args.config_file)
-auth = KeystonePassword(
- auth_url=config['nova_api_url'],
- username=config['username'],
- password=config['password'],
- tenant_name=config['admin_project_name']
-)
-keystoneClient = KeystoneClient(
- session=KeystoneSession(auth=auth), endpoint=config['nova_api_url'])
+
+def new_session(project):
+ auth = generic.Password(
+ auth_url=config['nova_api_url'],
+ username=config['username'],
+ password=config['password'],
+ user_domain_name='Default',
+ project_domain_name='Default',
+ project_name=project)
+
+ return keystone_session.Session(auth=auth)
+
+
+session = new_session(config['admin_project_name'])
+
+keystoneClient = keystone_client.Client(
+ session=session, interface='public', connect_retries=5)
projects = []
-for tenant in keystoneClient.tenants.list():
+for tenant in keystoneClient.projects.list():
projects.append(tenant.name)
aliases = {}
for project in projects:
- client = novaclient.Client(
- "1.1",
- config['username'],
- config['password'],
- project,
- config['nova_api_url']
- )
+ project_session = new_session(project)
+ client = novaclient.Client('2', session=project_session, connect_retries=5)
for server in client.servers.list():
serverAddresses = {}
diff --git a/modules/role/manifests/labs/dnsrecursor.pp
b/modules/role/manifests/labs/dnsrecursor.pp
index e95646c..9b2287b 100644
--- a/modules/role/manifests/labs/dnsrecursor.pp
+++ b/modules/role/manifests/labs/dnsrecursor.pp
@@ -73,7 +73,7 @@
class { '::dnsrecursor::labsaliaser':
username => 'novaadmin',
password => $wikitech_nova_ldap_user_pass,
- nova_api_url => "http://${nova_controller_hostname}:35357/v2.0";,
+ nova_api_url => "http://${nova_controller_hostname}:35357/v3";,
alias_file => $alias_file,
admin_project_name => $wikitech_nova_admin_project_name
}
--
To view, visit https://gerrit.wikimedia.org/r/345886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff2526edfb659229e6e0f10acfbe043c8465557b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
