Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/345639 )

Change subject: dns_floating_ip_updater:  Use novaobserver instead of novaadmin
......................................................................


dns_floating_ip_updater:  Use novaobserver instead of novaadmin

Bug: T158650
Change-Id: Ide0e555c7bb1a1b64126fd1b1184586bd61b21d5
---
M modules/role/manifests/labs/dns_floating_ip_updater.pp
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/labs/dns_floating_ip_updater.pp 
b/modules/role/manifests/labs/dns_floating_ip_updater.pp
index 397abc5..0f1da74 100644
--- a/modules/role/manifests/labs/dns_floating_ip_updater.pp
+++ b/modules/role/manifests/labs/dns_floating_ip_updater.pp
@@ -1,13 +1,13 @@
 class role::labs::dns_floating_ip_updater {
-    $keystoneconfig = hiera_hash('keystoneconfig', {})
+    $novaconfig = hiera_hash('novaconfig', {})
     $nova_controller_hostname = hiera('labs_nova_controller')
     $designateconfig = hiera_hash('designateconfig', {})
 
     $config = {
-        'username'                                 => 'novaadmin',
-        'password'                                 => 
$keystoneconfig['ldap_user_pass'],
+        'username'                                 => 
$novaconfig['observer_user'],
+        'password'                                 => 
$novaconfig['observer_password'],
         'nova_api_url'                             => 
"http://${nova_controller_hostname}:35357/v3";,
-        'admin_project_name'                       => 
$keystoneconfig['admin_project_name'],
+        'admin_project_name'                       => 
$novaconfig['observer_project'],
         'floating_ip_ptr_zone'                     => 
$designateconfig['floating_ip_ptr_zone'],
         'floating_ip_ptr_fqdn_matching_regex'      => 
$designateconfig['floating_ip_ptr_fqdn_matching_regex'],
         'floating_ip_ptr_fqdn_replacement_pattern' => 
$designateconfig['floating_ip_ptr_fqdn_replacement_pattern']

-- 
To view, visit https://gerrit.wikimedia.org/r/345639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide0e555c7bb1a1b64126fd1b1184586bd61b21d5
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to