add support for setting INHERIT_DATASTORE_ATTRs

epost-dev · Jul 22, 2015 · a96029e · a96029e
1 parent d72a1b2
commit a96029e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -361,6 +361,7 @@
             $hook_scripts_path              = $one::params::hook_scripts_path,
             $hook_scripts_pkgs              = $one::params::hook_scripts_pkgs,
             $hook_scripts                   = $one::params::hook_scripts,
+            $inherit_datastore_attrs        = $one::params::inherit_datastore_attrs,
             $oned_onegate_ip                = $one::params::oned_onegate_ip,
             $kickstart_network              = $one::params::kickstart_network,
             $kickstart_partition            = $one::params::kickstart_partition,

diff --git a/manifests/oned/config.pp b/manifests/oned/config.pp
@@ -21,6 +21,7 @@
   $hook_scripts            = $one::hook_scripts,
   $vm_hook_scripts         = $one::vm_hook_scripts,
   $host_hook_scripts       = $one::host_hook_scripts,
+  $inherit_datastore_attrs = $one::inherit_datastore_attrs,
   $oned_port               = $one::oned_port,
   $oned_db                 = $one::oned_db,
   $oned_db_user            = $one::oned_db_user,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -66,6 +66,9 @@
   $xmlrpc_keepalive_max_conn = hiera('one::oned::xmlrpc_keepalive_max_conn', '30')
   $xmlrpc_timeout            = hiera('one::oned::xmlrpc_timeout', '15')
 
+  # OpenNebula INHERIT attrs
+  $inherit_datastore_attrs   = hiera('one::oned::inherit_datastore_attrs', undef)
+
   # Sunstone configuration parameters
   $sunstone_listen_ip        = hiera('one::oned::sunstone_listen_ip', '127.0.0.1')
   $enable_support            = hiera('one::oned::enable_support', 'yes')

diff --git a/templates/oned.conf.erb b/templates/oned.conf.erb
@@ -869,6 +869,12 @@ INHERIT_DATASTORE_ATTR  = "CEPH_USER"
 INHERIT_DATASTORE_ATTR  = "GLUSTER_HOST"
 INHERIT_DATASTORE_ATTR  = "GLUSTER_VOLUME"
 
+<%- if @inherit_datastore_attrs != nil -%>
+  <%- @inherit_datastore_attrs.each do |attr| -%>
+INHERIT_DATASTORE_ATTR  = "<%= attr %>"
+  <%- end -%>
+<%- end -%>
+
 INHERIT_VNET_ATTR       = "VLAN_TAGGED_ID"
 INHERIT_VNET_ATTR       = "BRIDGE_OVS"