From 8010f9bb0f9014691e4c83a92eb6ef509de5fc8c Mon Sep 17 00:00:00 2001 From: Ramy Asselin Date: Tue, 29 Sep 2015 15:00:18 -0700 Subject: [PATCH] Add support for os-client By using os-client the nodepool.yaml file does not need to contain any secrets. Change-Id: I3bc873889f36e833d5755333b6ea5b2c0f32e568 --- manifests/nodepool.pp | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/manifests/nodepool.pp b/manifests/nodepool.pp index 389b5a0..2a16b51 100644 --- a/manifests/nodepool.pp +++ b/manifests/nodepool.pp @@ -21,9 +21,7 @@ class openstackci::nodepool ( $yaml_path = '/etc/project-config/nodepool/nodepool.yaml', $git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool', $revision = 'master', - $oscc_clouds = {}, - $oscc_cache = {}, - $oscc_client = {}, + $oscc_file_contents, $environment = {}, $nodepool_ssh_private_key = '', $vhost_name = $::fqdn, @@ -69,4 +67,35 @@ class openstackci::nodepool ( Class['project_config'], ], } + + file { '/home/nodepool/.config': + ensure => directory, + owner => 'nodepool', + group => 'nodepool', + require => [ + User['nodepool'], + ], + } + + file { '/home/nodepool/.config/openstack': + ensure => directory, + owner => 'nodepool', + group => 'nodepool', + require => [ + File['/home/nodepool/.config'], + ], + } + + file { '/home/nodepool/.config/openstack/clouds.yaml': + ensure => present, + owner => 'nodepool', + group => 'nodepool', + mode => '0400', + content => $oscc_file_contents, + require => [ + File['/home/nodepool/.config/openstack'], + User['nodepool'], + ], + } + }