Commit 596225bb authored by Alain Takoudjou's avatar Alain Takoudjou

Merge branch 'kvm-cluster'

parents e84d5e83 eb6ced9f
...@@ -106,7 +106,7 @@ on-update = true ...@@ -106,7 +106,7 @@ on-update = true
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
mode = 644 mode = 644
md5sum = 6ac9d1b06398b57cc1c8d63a9c492415 md5sum = 3fc6611feaabcacd7e51f3b5681120fd
download-only = true download-only = true
on-update = true on-update = true
......
...@@ -74,7 +74,7 @@ config-document-path = ${hash-code:passwd} ...@@ -74,7 +74,7 @@ config-document-path = ${hash-code:passwd}
return = return =
backend-url backend-url
url url
{% if str(use_nat).lower() -%} {% if str(use_nat).lower() == 'true' -%}
{% for port in nat_rules_list -%} {% for port in nat_rules_list -%}
{{ ' ' }}nat-rule-url-{{ port }} {{ ' ' }}nat-rule-url-{{ port }}
{% endfor -%} {% endfor -%}
......
...@@ -41,7 +41,7 @@ recipe = slapos.recipe.template ...@@ -41,7 +41,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/monitor.cfg.in url = ${:_profile_base_location_}/monitor.cfg.in
output = ${buildout:directory}/monitor.cfg output = ${buildout:directory}/monitor.cfg
filename = monitor.cfg filename = monitor.cfg
md5sum = 4d0c3b847c18a56068f04dd926487272 md5sum = 51284c0aeb62eccd37f8a4e1621ee28c
mode = 0644 mode = 0644
[monitor-bin] [monitor-bin]
......
...@@ -263,6 +263,9 @@ recipe = slapos.cookbook:wrapper ...@@ -263,6 +263,9 @@ recipe = slapos.cookbook:wrapper
apache-executable = ${apache:location}/bin/httpd apache-executable = ${apache:location}/bin/httpd
command-line = $${:apache-executable} -f $${monitor-httpd-configuration-file:rendered} -DFOREGROUND command-line = $${:apache-executable} -f $${monitor-httpd-configuration-file:rendered} -DFOREGROUND
wrapper-path = $${ca-httpd:executable} wrapper-path = $${ca-httpd:executable}
wait-for-files =
$${cadirectory:certs}/httpd.key
$${cadirectory:certs}/httpd.crt
[cgi-httpd-graceful-wrapper] [cgi-httpd-graceful-wrapper]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
......
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