opendev/system-config
Code Issues Proposed changes

Add datacentred cloud

Browse Source 
Adding this cloud for a demonstration.

Change-Id: If1caa5114d09677386d7feb28a28cef319d35fbc
This commit is contained in:
Elizabeth K. Joseph 2016-10-11 17:00:03 -07:00
parent 45b841f747
commit 2375a04fe4
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -791,6 +791,9 @@ node 'nodepool.openstack.org' {
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username') $vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password') $vexxhost_password = hiera('nodepool_vexxhost_password')
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project') $vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
$datacentred_username = hiera('nodepool_datacentred_username', 'username')
$datacentred_password = hiera('nodepool_datacentred_password')
$datacentred_project = hiera('nodepool_datacentred_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
class { 'openstack_project::server': class { 'openstack_project::server':
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),

10
modules/openstack_project/templates/nodepool/clouds.yaml.erb
View File

@ -135,3 +135,13 @@ clouds:
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: None floating_ip_source: None
cacert: /home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem cacert: /home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem
datacentred:
region_name: sal01
profile: datacentred
auth:
username: '<%= @datacentred_username %>'
password: '<%= @datacentred_password %>'
project_name: '<%= @datacentred_project %>'
project_domain_name: default
user_domain_name: default
identity_api_version: '2'

10
modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
View File

@ -307,3 +307,13 @@ clouds:
username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>'
password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>' password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>'
project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>' project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>'
openstackzuul-datacentred:
region_name: sal01
profile: datacentred
auth:
username: <%= @puppetmaster_clouds['openstackzuul_datacentred_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_datacentred_password'] %>
project_name: <%= @puppetmaster_clouds['openstackzuul_datacentred_project'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '2'