From 4267298140dd45ccdde1b552641b22fc7a13bd29 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Tue, 13 Mar 2018 18:43:19 -0400 Subject: [PATCH] Add Limestone credentials to *clouds.yaml We're happy to welcome Limestone as a new infrastructure donor and add the following cloud configurations: - openstackci-limestone (control plane) - openstackzuul-limestone (nodepool/testing nodes) The proper credentials have been committed to hiera. Change-Id: Iba7813f9c90a4ac84fd37ebb6556c6a98c03a079 --- .../puppetmaster/all-clouds.yaml.erb | 24 +++++++++++++++++++ .../puppetmaster/ansible-clouds.yaml.erb | 12 ++++++++++ 2 files changed, 36 insertions(+) diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 33f7ecf8f8..47987df81d 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -129,3 +129,27 @@ clouds: project_name: <%= @puppetmaster_clouds['openstackzuul_linaro_project_name'] %> project_domain_name: default user_domain_name: default + openstackci-limestone: + regions: + - RegionOne + auth: + auth_url: https://osa.continuous.pw:5000 + username: <%= @puppetmaster_clouds['openstackci_limestone_username'] %> + password: <%= @puppetmaster_clouds['openstackci_limestone_password'] %> + project_name: <%= @puppetmaster_clouds['openstackci_limestone_project_name'] %> + user_domain_name: default + project_domain_name: default + identity_api_version: 3 + cacert: /etc/openstack/limestone_cacert.pem + openstackzuul-limestone: + regions: + - RegionOne + auth: + auth_url: https://osa.continuous.pw:5000 + username: <%= @puppetmaster_clouds['openstackzuul_limestone_username'] %> + password: <%= @puppetmaster_clouds['openstackzuul_limestone_password'] %> + project_name: <%= @puppetmaster_clouds['openstackzuul_limestone_project_name'] %> + user_domain_name: default + project_domain_name: default + identity_api_version: 3 + cacert: /etc/openstack/limestone_cacert.pem diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 5bc3f29ec0..c1d2ceafc4 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -75,3 +75,15 @@ clouds: project_name: <%= @puppetmaster_clouds['openstackci_linaro_project_name'] %> project_domain_name: default user_domain_name: default + openstackci-limestone: + regions: + - RegionOne + auth: + auth_url: https://osa.continuous.pw:5000 + username: <%= @puppetmaster_clouds['openstackci_limestone_username'] %> + password: <%= @puppetmaster_clouds['openstackci_limestone_password'] %> + project_name: <%= @puppetmaster_clouds['openstackci_limestone_project_name'] %> + user_domain_name: default + project_domain_name: default + identity_api_version: 3 + cacert: /etc/openstack/limestone_cacert.pem