summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-09 13:39:16 +0000
committerGerrit Code Review <review@openstack.org>2015-10-09 13:39:16 +0000
commit7959d3d4ca8a53bfb0c588e5ebac54eea7a76cd5 (patch)
treed9ecc2c3e0d13a5e0872861f419caa662857fb45
parentce2e739614dc3df80742961a3beaf00a1b7504b2 (diff)
parent4906bf31786abcc5a5d08734deac70cb3b20742b (diff)
Merge "Allow to send optional values to configuration"
-rw-r--r--manifests/init.pp1
-rw-r--r--templates/pip.conf.erb4
2 files changed, 5 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 62a1537..fb7e870 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,6 +4,7 @@ class pip (
4 $index_url = 'https://pypi.python.org/simple', 4 $index_url = 'https://pypi.python.org/simple',
5 $trusted_hosts = [], 5 $trusted_hosts = [],
6 $manage_pip_conf = false, 6 $manage_pip_conf = false,
7 $optional_settings = {},
7) { 8) {
8 include ::pip::params 9 include ::pip::params
9 validate_array($trusted_hosts) 10 validate_array($trusted_hosts)
diff --git a/templates/pip.conf.erb b/templates/pip.conf.erb
index caf7976..8477626 100644
--- a/templates/pip.conf.erb
+++ b/templates/pip.conf.erb
@@ -6,3 +6,7 @@ trusted-host =
6 <%= trusted_host %> 6 <%= trusted_host %>
7<% end -%> 7<% end -%>
8<% end -%> 8<% end -%>
9
10<% @optional_settings.keys.sort.each do |setting| -%>
11<%= setting -%> = <%= @optional_settings[setting] %>
12<% end -%>