diff --git a/manifests/init.pp b/manifests/init.pp index fadb0e7..a211509 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,6 +27,7 @@ class nodepool ( $vhost_name = 'nodepool.openstack.org', $image_log_document_root = '/var/log/nodepool/image', $enable_image_log_via_http = false, + $environment = {}, ) { class { 'mysql::server': diff --git a/templates/nodepool.default.erb b/templates/nodepool.default.erb index 657027e..a0be88d 100644 --- a/templates/nodepool.default.erb +++ b/templates/nodepool.default.erb @@ -1,6 +1,8 @@ -<% if scope.lookupvar("nodepool::statsd_host") != "" %> +<% if scope.lookupvar("nodepool::statsd_host") != "" -%> export STATSD_HOST=<%= scope.lookupvar("nodepool::statsd_host") %> export STATSD_PORT=8125 -<% end %> +<% end -%> +<% scope.lookupvar("nodepool::environment").keys.sort.each do |key| -%> +export <%= key %>='<%= scope.lookupvar("nodepool::environment")[key] %>' +<% end -%> DAEMON_ARGS="-c /etc/nodepool/nodepool.yaml -l /etc/nodepool/logging.conf" -