From 44cdaba904b30cc026b7f9a80c097fda6d99c62d Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 28 Sep 2016 14:03:12 +0200 Subject: [PATCH] Add chocolate params and resources to Nodepool node Change-Id: Ib78594628ed3d2b780915fb50bb3943e10452ef5 --- manifests/site.pp | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 3797cbab47..9efe6e2107 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -772,15 +772,18 @@ 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_vanilla_username = hiera('nodepool_infracloud_vanilla_username', 'username') - $infracloud_vanilla_password = hiera('nodepool_infracloud_vanilla_password') - $infracloud_vanilla_project = hiera('nodepool_infracloud_vanilla_project', 'project') - $osic_cloud1_username = hiera('nodepool_osic_cloud1_username', 'username') - $osic_cloud1_password = hiera('nodepool_osic_cloud1_password') - $osic_cloud1_project = hiera('nodepool_osic_cloud1_project', 'project') - $osic_cloud8_username = hiera('nodepool_osic_cloud8_username', 'username') - $osic_cloud8_password = hiera('nodepool_osic_cloud8_password') - $osic_cloud8_project = hiera('nodepool_osic_cloud8_project', 'project') + $infracloud_vanilla_username = hiera('nodepool_infracloud_vanilla_username', 'username') + $infracloud_vanilla_password = hiera('nodepool_infracloud_vanilla_password') + $infracloud_vanilla_project = hiera('nodepool_infracloud_vanilla_project', 'project') + $infracloud_chocolate_username = hiera('nodepool_infracloud_chocolate_username', 'username') + $infracloud_chocolate_password = hiera('nodepool_infracloud_chocolate_password') + $infracloud_chocolate_project = hiera('nodepool_infracloud_chocolate_project', 'project') + $osic_cloud1_username = hiera('nodepool_osic_cloud1_username', 'username') + $osic_cloud1_password = hiera('nodepool_osic_cloud1_password') + $osic_cloud1_project = hiera('nodepool_osic_cloud1_project', 'project') + $osic_cloud8_username = hiera('nodepool_osic_cloud8_username', 'username') + $osic_cloud8_password = hiera('nodepool_osic_cloud8_password') + $osic_cloud8_project = hiera('nodepool_osic_cloud8_project', 'project') $vexxhost_username = hiera('nodepool_vexxhost_username', 'username') $vexxhost_password = hiera('nodepool_vexxhost_password') $vexxhost_project = hiera('nodepool_vexxhost_project', 'project') @@ -819,6 +822,14 @@ node 'nodepool.openstack.org' { content => hiera('infracloud_vanilla_ssl_cert_file_contents'), require => Class['::openstackci::nodepool'], } + file { '/home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem': + ensure => present, + owner => 'nodepool', + group => 'nodepool', + mode => '0600', + content => hiera('infracloud_chocolate_ssl_cert_file_contents'), + require => Class['::openstackci::nodepool'], + } } # Node-OS: trusty