Merge "Add omfracloud to nodepool"

manifests/site.pp

@@ -670,7 +670,17 @@ node 'nodepool.openstack.org' {
   $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],

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'