diff --git a/manifests/site.pp b/manifests/site.pp index d3f2ab6f21..7678711be9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -652,25 +652,35 @@ node 'status.openstack.org' { # Node-OS: trusty node 'nodepool.openstack.org' { - $bluebox_username = hiera('nodepool_bluebox_username', 'username') - $bluebox_password = hiera('nodepool_bluebox_password') - $bluebox_project = hiera('nodepool_bluebox_project', 'project') - $rackspace_username = hiera('nodepool_rackspace_username', 'username') - $rackspace_password = hiera('nodepool_rackspace_password') - $rackspace_project = hiera('nodepool_rackspace_project', 'project') - $hpcloud_username = hiera('nodepool_hpcloud_username', 'username') - $hpcloud_password = hiera('nodepool_hpcloud_password') - $hpcloud_project = hiera('nodepool_hpcloud_project', 'project') - $internap_username = hiera('nodepool_internap_username', 'username') - $internap_password = hiera('nodepool_internap_password') - $internap_project = hiera('nodepool_internap_project', 'project') - $ovh_username = hiera('nodepool_ovh_username', 'username') - $ovh_password = hiera('nodepool_ovh_password') - $ovh_project = hiera('nodepool_ovh_project', 'project') - $tripleo_username = hiera('nodepool_tripleo_username', 'username') - $tripleo_password = hiera('nodepool_tripleo_password') - $tripleo_project = hiera('nodepool_tripleo_project', 'project') - $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") + $bluebox_username = hiera('nodepool_bluebox_username', 'username') + $bluebox_password = hiera('nodepool_bluebox_password') + $bluebox_project = hiera('nodepool_bluebox_project', 'project') + $rackspace_username = hiera('nodepool_rackspace_username', 'username') + $rackspace_password = hiera('nodepool_rackspace_password') + $rackspace_project = hiera('nodepool_rackspace_project', 'project') + $hpcloud_username = hiera('nodepool_hpcloud_username', 'username') + $hpcloud_password = hiera('nodepool_hpcloud_password') + $hpcloud_project = hiera('nodepool_hpcloud_project', 'project') + $internap_username = hiera('nodepool_internap_username', 'username') + $internap_password = hiera('nodepool_internap_password') + $internap_project = hiera('nodepool_internap_project', 'project') + $ovh_username = hiera('nodepool_ovh_username', 'username') + $ovh_password = hiera('nodepool_ovh_password') + $ovh_project = hiera('nodepool_ovh_project', 'project') + $tripleo_username = hiera('nodepool_tripleo_username', 'username') + $tripleo_password = hiera('nodepool_tripleo_password') + $tripleo_project = hiera('nodepool_tripleo_project', 'project') + $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': sysadmins => hiera('sysadmins', []), iptables_public_tcp_ports => [80], diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 4aaed890ca..c616711a2b 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 %>' + 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'