Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/345887 )
Change subject: labs-ip-alias-dump.py: Use novaobserver creds rather than
novaadmin
......................................................................
labs-ip-alias-dump.py: Use novaobserver creds rather than novaadmin
Bug: T158650
Change-Id: I2e0efc7089ed78189057f613b3175ea298031092
---
M modules/dnsrecursor/files/labs-ip-alias-dump.py
M modules/dnsrecursor/manifests/labsaliaser.pp
M modules/role/manifests/labs/dnsrecursor.pp
3 files changed, 11 insertions(+), 11 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 a9c059d..6f0d834 100644
--- a/modules/dnsrecursor/files/labs-ip-alias-dump.py
+++ b/modules/dnsrecursor/files/labs-ip-alias-dump.py
@@ -44,7 +44,7 @@
return keystone_session.Session(auth=auth)
-session = new_session(config['admin_project_name'])
+session = new_session(config['observer_project_name'])
keystoneClient = keystone_client.Client(
session=session, interface='public', connect_retries=5)
diff --git a/modules/dnsrecursor/manifests/labsaliaser.pp
b/modules/dnsrecursor/manifests/labsaliaser.pp
index 24a2d9d..1e9c9c7 100644
--- a/modules/dnsrecursor/manifests/labsaliaser.pp
+++ b/modules/dnsrecursor/manifests/labsaliaser.pp
@@ -4,7 +4,7 @@
$nova_api_url,
$extra_records,
$alias_file,
- $admin_project_name,
+ $observer_project_name,
) {
require_package(['python-novaclient', 'python-keystoneclient'])
@@ -15,7 +15,7 @@
'output_path' => $alias_file,
'nova_api_url' => $nova_api_url,
'extra_records' => $extra_records,
- 'admin_project_name' => $admin_project_name,
+ 'observer_project_name' => $observer_project_name,
}
file { '/etc/labs-dns-alias.yaml':
diff --git a/modules/role/manifests/labs/dnsrecursor.pp
b/modules/role/manifests/labs/dnsrecursor.pp
index 9b2287b..fab9ead 100644
--- a/modules/role/manifests/labs/dnsrecursor.pp
+++ b/modules/role/manifests/labs/dnsrecursor.pp
@@ -27,7 +27,8 @@
description => 'Recursive DNS server for Labs instances',
}
- $keystoneconfig = hiera_hash('keystoneconfig', {})
+ $novaconfig = hiera_hash('novaconfig', {})
+
$dnsconfig = hiera_hash('labsdnsconfig', {})
include ::network::constants
$all_networks = $::network::constants::all_networks
@@ -40,8 +41,7 @@
}
# We need to alias some public IPs to their corresponding private IPs.
- $wikitech_nova_ldap_user_pass = $keystoneconfig['ldap_user_pass']
- $wikitech_nova_admin_project_name = $keystoneconfig['admin_project_name']
+
$nova_controller_hostname = hiera('labs_nova_controller')
$listen_addresses = $::realm ? {
@@ -71,11 +71,11 @@
}
class { '::dnsrecursor::labsaliaser':
- username => 'novaadmin',
- password => $wikitech_nova_ldap_user_pass,
- nova_api_url => "http://${nova_controller_hostname}:35357/v3";,
- alias_file => $alias_file,
- admin_project_name => $wikitech_nova_admin_project_name
+ username => $novaconfig['observer_user'],
+ password => $novaconfig['observer_password'],
+ nova_api_url => "http://${nova_controller_hostname}:35357/v3";,
+ alias_file => $alias_file,
+ observer_project_name => $novaconfig['observer_project']
}
class { '::dnsrecursor::metalresolver':
metal_resolver => $metal_resolver,
--
To view, visit https://gerrit.wikimedia.org/r/345887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e0efc7089ed78189057f613b3175ea298031092
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
