From dad09243076798b5ecf12ec713b085a6da964505 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Tue, 27 Sep 2016 12:15:57 +0200 Subject: [PATCH] Add chocolate oscc cloud to puppetmaster Change-Id: If9f698cb449737cd3e098c18ab1daa6646300b85 --- .../templates/puppetmaster/all-clouds.yaml.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index ce8f529b5d..e21f9ad90c 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -20,6 +20,17 @@ clouds: user_domain_name: default identity_api_version: '3' cacert: /etc/ssl/certs/ca-certificates.crt + admin-infracloud-chocolate: + region_name: RegionOne + auth: + auth_url: https://controller00.chocolate.ic.openstack.org:5000 + username: <%= @puppetmaster_clouds['admin_infracloud_chocolate_username'] %> + password: <%= @puppetmaster_clouds['admin_infracloud_chocolate_password'] %> + project_name: <%= @puppetmaster_clouds['admin_infracloud_chocolate_project_name'] %> + project_domain_name: default + user_domain_name: default + identity_api_version: '3' + cacert: /etc/ssl/certs/ca-certificates.crt infra-files-ro: profile: rackspace auth: