Commit 3e1a0b5f authored by Łukasz Nowak's avatar Łukasz Nowak

fix "kvm: Protected parameters passed in buildout"

It workarounds stack/resilient/pbsready.cfg.in directory:backup string
concatenation:

  backup = $${basedirectory:backup}/$${slap-parameter:namebase}
parent 722ecd22
...@@ -23,7 +23,7 @@ md5sum = bf0c01ac7493693bb57ebef00bb20fa0 ...@@ -23,7 +23,7 @@ md5sum = bf0c01ac7493693bb57ebef00bb20fa0
[template-kvm-cluster] [template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in filename = instance-kvm-cluster.cfg.jinja2.in
md5sum = 5f092853a949e129ed3f6938bb439b6b md5sum = 59b92e1300aad4e9b116c532caf7d042
[template-kvm-resilient] [template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2 filename = instance-kvm-resilient.cfg.jinja2
...@@ -31,7 +31,7 @@ md5sum = 7de5756f59ef7d823cd8ed33e6d15230 ...@@ -31,7 +31,7 @@ md5sum = 7de5756f59ef7d823cd8ed33e6d15230
[template-kvm-import] [template-kvm-import]
filename = instance-kvm-import.cfg.jinja2.in filename = instance-kvm-import.cfg.jinja2.in
md5sum = 3e7ff2ba85762ca47b5f90495d492570 md5sum = 7b15fdc6f19b1f44ff5a56586102ffe2
[template-kvm-import-script] [template-kvm-import-script]
filename = template/kvm-import.sh.jinja2 filename = template/kvm-import.sh.jinja2
...@@ -39,7 +39,7 @@ md5sum = cd0008f1689dfca9b77370bc4d275b70 ...@@ -39,7 +39,7 @@ md5sum = cd0008f1689dfca9b77370bc4d275b70
[template-kvm-export] [template-kvm-export]
filename = instance-kvm-export.cfg.jinja2 filename = instance-kvm-export.cfg.jinja2
md5sum = c15f7600389b0c641622fcfdc42260d8 md5sum = 4c9efdc9ef35d1096173084541be712d
[template-kvm-export-script] [template-kvm-export-script]
filename = template/kvm-export.sh.jinja2 filename = template/kvm-export.sh.jinja2
......
...@@ -24,7 +24,11 @@ global-ipv6 = {{ ipv6 }} ...@@ -24,7 +24,11 @@ global-ipv6 = {{ ipv6 }}
[slap-parameter] [slap-parameter]
{% for k, v in slapparameter_dict.items() -%} {% for k, v in slapparameter_dict.items() -%}
{%- if k == 'namebase' %}
{{ k }} = {{ v }}
{%- else %}
{{ k }} = {{ dumps(v) }} {{ k }} = {{ dumps(v) }}
{%- endif %}
{% endfor -%} {% endfor -%}
[request-common] [request-common]
......
...@@ -9,7 +9,11 @@ parts += ...@@ -9,7 +9,11 @@ parts +=
[slap-parameter] [slap-parameter]
{% for k, v in slapparameter_dict.items() -%} {% for k, v in slapparameter_dict.items() -%}
{%- if k == 'namebase' %}
{{ k }} = {{ v }}
{%- else %}
{{ k }} = {{ dumps(v) }} {{ k }} = {{ dumps(v) }}
{%- endif %}
{% endfor -%} {% endfor -%}
# Create the exporter executable, which is a simple shell script # Create the exporter executable, which is a simple shell script
......
...@@ -14,7 +14,11 @@ extends = ...@@ -14,7 +14,11 @@ extends =
[slap-parameter] [slap-parameter]
{% for k, v in slapparameter_dict.items() -%} {% for k, v in slapparameter_dict.items() -%}
{%- if k == 'namebase' %}
{{ k }} = {{ v }}
{%- else %}
{{ k }} = {{ dumps(v) }} {{ k }} = {{ dumps(v) }}
{%- endif %}
{% endfor -%} {% endfor -%}
[resilient-publish-connection-parameter] [resilient-publish-connection-parameter]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment