From e12eb7b409aab36a28fb6a4f9808fcf1fe069f29 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 4 Jun 2015 13:52:51 -0700 Subject: [PATCH] Revert "Switch to using '-' in clouds.yaml" This reverts commit 40a9cef1fcea4bb5aae90baa4eafb5289b86254c. This did not work and I do not know why. Change-Id: I471c68be0a2db49e56a90028781d1a487e6316ce --- .../templates/nodepool/clouds.yaml.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 7c2803e3a6..fcd566c7ec 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 - region-name: DFW,ORD,IAD + region_name: DFW,ORD,IAD 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 + 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'