Merge branch 'messy' into 'qa'

add cloud_tpl_path

See merge request ai/it-puppet-module-dirac!111

code/manifests/init.pp

@@ -25,6 +25,7 @@
 #                         Important: while running install_site.sh, you should remove the existing
 #                         dirac.cfg
 # @param rpm_repo url to the yum repo to be used to install runit
+# @param cloud_tpl_path parameter to generate the cloud.auth file
 #
 # @param teigi_keys list of keys that are used in the templates
 # @param dirac_config_args dictionnary that can be used in the templates (e.g.  <%= @dirac_config_args['vo'] %>)
@@ -47,6 +48,7 @@ class dirac (String $dirac_user = 'dirac', String $dirac_group = 'dirac',
             String $nginx_tpl_path = 'dirac/nginx.conf.erb',
             String $install_tpl_path = 'dirac/install.cfg.erb',
             String $rpm_repo = 'http://cern.ch/diracproject/rpm/$releasever',
+            String $cloud_tpl_path = undef,
             Array $teigi_keys = [],
             Hash $dirac_config_args = {},
             Boolean $oracle_support = false,
@@ -249,6 +251,17 @@ class dirac (String $dirac_user = 'dirac', String $dirac_group = 'dirac',
     mode       => '0640',
   }
 
+
+  if $cloud_tpl_path != '' {
+    teigi::secret::sub_file{'/opt/dirac/etc/cloud.auth':
+      teigi_keys => $teigi_keys,
+      content    => template($cloud_tpl_path),
+      owner      => $dirac_user,
+      group      => $dirac_group,
+      mode       => '0640',
+    }
+  }
+
   if versioncmp($facts['os']['release']['major'],'7') == 0 {
     firewall {'100 allow ipv4 ports to the world':
       proto  => 'tcp',