From 8ada5f65f6fee1cce9a2dd335aacfb2199de78d3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 26 May 2015 19:29:09 -0700 Subject: [PATCH] Use _ instead of - in clouds.yaml The keys that openstack client config look for are project_id and auth_url not project-id and auth-url. Update the keys so that nodepool's shade config works properly. Change-Id: Idad2894d1a9eef1a4f77d52ea4a099882c889265 --- .../openstack_project/templates/nodepool/clouds.yaml.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 6531d675c4..fcd566c7ec 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -5,17 +5,17 @@ clouds: auth: username: '<%= rackspace_username %>' password: '<%= rackspace_password %>' - project-id: '<%= rackspace_project %>' + project_id: '<%= rackspace_project %>' hpcloud: cloud: hp region_name: region-a.geo-1,region-b.geo-1 auth: username: '<%= hpcloud_username %>' password: '<%= hpcloud_password %>' - project-id: '<%= hpcloud_project %>' + project_id: '<%= hpcloud_project %>' tripleo-test-cloud-rh1: auth: username: '<%= tripleo_username %>' password: '<%= tripleo_password %>' - project-id: '<%= tripleo_project %>' - auth-url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0' + project_id: '<%= tripleo_project %>' + auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0'