From 65b26d95fe3de54db895332e27d7032c904d6d7b Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 26 Feb 2016 10:02:26 -0800 Subject: [PATCH] Add OSIC clouds.yaml details This adds clouds.yaml information to our three clouds.yaml files for our two users in the OSIC cloud. This will let us manage the OSIC cloud resources and start deploying tests to OSIC with nodepool. Change-Id: I5a392d165fb6db2e70036008a55cd99eed237ab4 --- manifests/site.pp | 3 +++ .../templates/nodepool/clouds.yaml.erb | 13 ++++++++++ .../puppetmaster/all-clouds.yaml.erb | 26 +++++++++++++++++++ .../puppetmaster/ansible-clouds.yaml.erb | 13 ++++++++++ 4 files changed, 55 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index b708dbf495..f2eed835b4 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -678,6 +678,9 @@ node 'nodepool.openstack.org' { $infracloud_username = hiera('nodepool_infracloud_username', 'username') $infracloud_password = hiera('nodepool_infracloud_password') $infracloud_project = hiera('nodepool_infracloud_project', 'project') + $osic_username = hiera('nodepool_osic_username', 'username') + $osic_password = hiera('nodepool_osic_password') + $osic_project = hiera('nodepool_osic_project', 'project') $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") class { 'openstack_project::server': sysadmins => hiera('sysadmins', []), diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 4aaed890ca..baf4d98121 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -46,3 +46,16 @@ clouds: username: '<%= internap_username %>' password: '<%= internap_password %>' project_name: '<%= internap_project %>' + osic: + region_name: RegionOne + auth: + auth_url: https://172.99.101.17:5000 + username: <%= osic_username %> + password: <%= osic_password %> + project_id: <%= osic_project %> + project_domain_name: default + user_domain_name: default + identity_api_version: '3' + # Since DNS is not setup for the CN in the self signed cert we are not + # able to verify even if we provide the cert to check against. + verify: False diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 2b95aebc1e..e800447f93 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -112,3 +112,29 @@ clouds: username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %> password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %> project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %> + openstackjenkins-osic: + region_name: RegionOne + auth: + auth_url: https://172.99.101.17:5000 + username: <%= @puppetmaster_clouds['openstackjenkins_osic_username'] %> + password: <%= @puppetmaster_clouds['openstackjenkins_osic_password'] %> + project_id: <%= @puppetmaster_clouds['openstackjenkins_osic_project_id'] %> + project_domain_name: default + user_domain_name: default + identity_api_version: '3' + # Since DNS is not setup for the CN in the self signed cert we are not + # able to verify even if we provide the cert to check against. + verify: False + openstackci-osic: + region_name: RegionOne + auth: + auth_url: https://172.99.101.17:5000 + username: <%= @puppetmaster_clouds['openstackci_osic_username'] %> + password: <%= @puppetmaster_clouds['openstackci_osic_password'] %> + project_id: <%= @puppetmaster_clouds['openstackci_osic_project_id'] %> + project_domain_name: default + user_domain_name: default + identity_api_version: '3' + # Since DNS is not setup for the CN in the self signed cert we are not + # able to verify even if we provide the cert to check against. + verify: False diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 7ccad3c727..dc46b9a460 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -38,3 +38,16 @@ clouds: username: <%= @puppetmaster_clouds['openstackci_rax_username'] %> password: <%= @puppetmaster_clouds['openstackci_rax_password'] %> project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %> + openstackci-osic: + region_name: RegionOne + auth: + auth_url: https://172.99.101.17:5000 + username: <%= @puppetmaster_clouds['openstackci_osic_username'] %> + password: <%= @puppetmaster_clouds['openstackci_osic_password'] %> + project_id: <%= @puppetmaster_clouds['openstackci_osic_project_id'] %> + project_domain_name: default + user_domain_name: default + identity_api_version: '3' + # Since DNS is not setup for the CN in the self signed cert we are not + # able to verify even if we provide the cert to check against. + verify: False