From e6d4643a814ff4d9e689da5924380e0f83dd94d5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 28 May 2015 12:13:47 -0400 Subject: [PATCH] Use profile in clouds.yaml instead of cloud The cloud moniker was confusing to people, so we added support in os-client-config for calling it profile instead. Update the clouds.yaml to indicate this. Also, change hp and tripleo to project_name since that's what those are. Rackspace is still a project_id. Change-Id: I77b2153a096ba3fced2e4d7c1f63663f798d4046 --- .../templates/nodepool/clouds.yaml.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index fcd566c7ec..713bf185d3 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -1,21 +1,21 @@ clouds: rax: - cloud: rackspace + profile: rackspace region_name: DFW,ORD,IAD auth: username: '<%= rackspace_username %>' password: '<%= rackspace_password %>' - project_id: '<%= rackspace_project %>' + project_id: <%= rackspace_project %> hpcloud: - cloud: hp + profile: hp region_name: region-a.geo-1,region-b.geo-1 auth: username: '<%= hpcloud_username %>' password: '<%= hpcloud_password %>' - project_id: '<%= hpcloud_project %>' + project_name: '<%= hpcloud_project %>' tripleo-test-cloud-rh1: auth: username: '<%= tripleo_username %>' password: '<%= tripleo_password %>' - project_id: '<%= tripleo_project %>' + project_name: '<%= tripleo_project %>' auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0'