opendev/system-config
Code Issues Proposed changes

Merge "Add OmfraCloud to puppetmaster_clouds"

Browse Source
This commit is contained in:
Jenkins 2016-02-23 17:26:42 +00:00 committed by Gerrit Code Review
commit 666ae8ec39
4 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/site.pp
View File

@ -223,10 +223,11 @@ node 'puppetmaster.openstack.org' {
pin_puppet => '3.6.',
}
class { 'openstack_project::puppetmaster':
root_rsa_key => hiera('puppetmaster_root_rsa_key'),
jenkins_api_user => hiera('jenkins_api_user', 'username'),
jenkins_api_key => hiera('jenkins_api_key'),
puppetmaster_clouds => hiera('puppetmaster_clouds'),
root_rsa_key => hiera('puppetmaster_root_rsa_key'),
jenkins_api_user => hiera('jenkins_api_user', 'username'),
jenkins_api_key => hiera('jenkins_api_key'),
puppetmaster_clouds => hiera('puppetmaster_clouds'),
infracloud_hpuswest_ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
}
}

9
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -3,6 +3,7 @@
class openstack_project::puppetmaster (
$jenkins_api_key,
$puppetmaster_clouds,
$infracloud_hpuswest_ssl_cert_file_contents,
$jenkins_api_user = 'hudson-openstack',
$root_rsa_key = 'xxx',
$puppetdb = true,
@ -127,6 +128,14 @@ class openstack_project::puppetmaster (
content => template('openstack_project/puppetmaster/ansible-clouds.yaml.erb'),
}
file { '/etc/openstack/infracloud_west_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
mode => '0600',
content => $infracloud_hpuswest_ssl_cert_file_contents,
}
# For puppet master apache serving.
package { 'puppetmaster-passenger':
ensure => present,

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

@ -77,6 +77,32 @@ clouds:
username: <%= @puppetmaster_clouds['openstackjenkins_bluebox_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_bluebox_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %>
openstackjenkins-infracloud-west:
region_name: RegionOne
auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
username: <%= @puppetmaster_clouds['openstackjenkins_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_infracloud_project_name'] %>
cacert: '/etc/openstack/infracloud_west_cacert.pem'
auth_type: 'v3password'
identity_api_version: '3'
floating_ip_source: 'None'
project_domain_id: default
user_domain_id: default
openstackci-infracloud-west:
region_name: RegionOne
auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
cacert: '/etc/openstack/infracloud_west_cacert.pem'
auth_type: 'v3password'
identity_api_version: '3'
floating_ip_source: 'None'
project_domain_id: default
user_domain_id: default
openstackjenkins-rax:
regions:
- DFW

9
modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
View File

@ -38,3 +38,12 @@ clouds:
username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
password: <%= @puppetmaster_clouds['openstackci_rax_password'] %>
project_id: <%= @puppetmaster_clouds['openstackci_rax_project_id'] %>
openstackci-infracloud-west:
region_name: RegionOne
auth:
auth_url: https://controller00.hpuswest.ic.openstack.org:35357/v3
username: <%= @puppetmaster_clouds['openstackci_infracloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_project_name'] %>
project_domain_id: default
user_domain_id: default