From 40a9cef1fcea4bb5aae90baa4eafb5289b86254c Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 29 May 2015 09:20:29 -0700 Subject: [PATCH] Switch to using '-' in clouds.yaml OSCC supports both '-' and '_'. All our other nodepool related configs use '-', so switch this one to use it to reduce cognitive dissonance and copy/pastability. Change-Id: I6244631734088d213729d19f52c0d766c5737965 --- .../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 fcd566c7ec..7c2803e3a6 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'