opendev/system-config
Code Issues Proposed changes

Merge "Add omfracloud to nodepool"

Browse Source
This commit is contained in:
Jenkins 2016-02-23 18:03:55 +00:00 committed by Gerrit Code Review
commit 65c65fd78f
2 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
manifests/site.pp
View File

@ -652,25 +652,35 @@ node 'status.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node 'nodepool.openstack.org' { node 'nodepool.openstack.org' {
$bluebox_username = hiera('nodepool_bluebox_username', 'username') $bluebox_username = hiera('nodepool_bluebox_username', 'username')
$bluebox_password = hiera('nodepool_bluebox_password') $bluebox_password = hiera('nodepool_bluebox_password')
$bluebox_project = hiera('nodepool_bluebox_project', 'project') $bluebox_project = hiera('nodepool_bluebox_project', 'project')
$rackspace_username = hiera('nodepool_rackspace_username', 'username') $rackspace_username = hiera('nodepool_rackspace_username', 'username')
$rackspace_password = hiera('nodepool_rackspace_password') $rackspace_password = hiera('nodepool_rackspace_password')
$rackspace_project = hiera('nodepool_rackspace_project', 'project') $rackspace_project = hiera('nodepool_rackspace_project', 'project')
$hpcloud_username = hiera('nodepool_hpcloud_username', 'username') $hpcloud_username = hiera('nodepool_hpcloud_username', 'username')
$hpcloud_password = hiera('nodepool_hpcloud_password') $hpcloud_password = hiera('nodepool_hpcloud_password')
$hpcloud_project = hiera('nodepool_hpcloud_project', 'project') $hpcloud_project = hiera('nodepool_hpcloud_project', 'project')
$internap_username = hiera('nodepool_internap_username', 'username') $internap_username = hiera('nodepool_internap_username', 'username')
$internap_password = hiera('nodepool_internap_password') $internap_password = hiera('nodepool_internap_password')
$internap_project = hiera('nodepool_internap_project', 'project') $internap_project = hiera('nodepool_internap_project', 'project')
$ovh_username = hiera('nodepool_ovh_username', 'username') $ovh_username = hiera('nodepool_ovh_username', 'username')
$ovh_password = hiera('nodepool_ovh_password') $ovh_password = hiera('nodepool_ovh_password')
$ovh_project = hiera('nodepool_ovh_project', 'project') $ovh_project = hiera('nodepool_ovh_project', 'project')
$tripleo_username = hiera('nodepool_tripleo_username', 'username') $tripleo_username = hiera('nodepool_tripleo_username', 'username')
$tripleo_password = hiera('nodepool_tripleo_password') $tripleo_password = hiera('nodepool_tripleo_password')
$tripleo_project = hiera('nodepool_tripleo_project', 'project') $tripleo_project = hiera('nodepool_tripleo_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") $infracloud_username = hiera('nodepool_infracloud_username', 'username')
$infracloud_password = hiera('nodepool_infracloud_password')
$infracloud_project = hiera('nodepool_infracloud_project', 'project')
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
file { '/etc/openstack/infracloud_west_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
mode => '0600',
content => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
}
class { 'openstack_project::server': class { 'openstack_project::server':
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
iptables_public_tcp_ports => [80], iptables_public_tcp_ports => [80],

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

@ -46,3 +46,16 @@ clouds:
username: '<%= internap_username %>' username: '<%= internap_username %>'
password: '<%= internap_password %>' password: '<%= internap_password %>'
project_name: '<%= internap_project %>' project_name: '<%= internap_project %>'
infracloud-west:
region_name: RegionOne
auth:
username: '<%= infracloud_username %>'
password: '<%= infracloud_password %>'
project_name: '<%= infracloud_project %>'
user_domain_id: 'default'
project_domain_id: 'default'
auth_url: 'https://controller00.hpuswest.ic.openstack.org:35357/v3'
auth_type: 'v3password'
cacert: '/etc/openstack/infracloud_west_cacert.pem'
identity_api_version: '3'
floating_ip_source: 'None'