From f6331a0c3f23ccbe599795102aa591c4c313180c Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 28 Sep 2016 13:24:54 +0200 Subject: [PATCH] Add chocolate openstackci oscc to Puppetmaster all-clouds Change-Id: I15fcc9ee4ebb1d8b1896b806761d64fe4da44a1b --- .../templates/puppetmaster/all-clouds.yaml.erb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index e21f9ad90c..47a37bd625 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -67,6 +67,18 @@ clouds: identity_api_version: '3' floating_ip_source: None cacert: /etc/ssl/certs/ca-certificates.crt + openstackci-infracloud-chocolate: + region_name: RegionOne + auth: + auth_url: https://controller00.chocolate.ic.openstack.org:5000 + username: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_username'] %> + password: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_password'] %> + project_name: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_project_name'] %> + project_domain_name: default + user_domain_name: default + identity_api_version: '3' + floating_ip_source: None + cacert: /etc/ssl/certs/ca-certificates.crt openstackci-internap: profile: internap auth: