From 1ba1b5203c1ce5e07ffda07bf5c5678c52106665 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 24 Feb 2016 12:02:45 -0800 Subject: [PATCH] Fix omfra admin creds in all-clouds.yaml Change-Id: I6a47d1998427329b3635f36f781217ef74fad8c7 --- .../templates/puppetmaster/all-clouds.yaml.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 015652238f..7c8a60efcd 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -103,9 +103,9 @@ clouds: region_name: RegionOne auth: auth_url: https://controller00.hpuswest.ic.openstack.org:35357/ - username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %> - password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %> - project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %> + username: <%= @puppetmaster_clouds['admin_infracloud_username'] %> + password: <%= @puppetmaster_clouds['admin_infracloud_password'] %> + project_name: <%= @puppetmaster_clouds['admin_infracloud_project_name'] %> cacert: '/etc/openstack/infracloud_west_cacert.pem' identity_api_version: '3' openstackjenkins-rax: