Commit 4c2d88d3 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

apache-frontend: update slave publication section to current publish recipe

parent db3610ce
...@@ -78,7 +78,7 @@ apache_custom_https = {{ dumps(apache_custom_https) }} ...@@ -78,7 +78,7 @@ apache_custom_https = {{ dumps(apache_custom_https) }}
[{{ publish_section_title }}] [{{ publish_section_title }}]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
public-ipv4 = {{ public_ipv4 }} public-ipv4 = {{ public_ipv4 }}
slave-reference = {{ slave_instance.get('slave_reference') }} -slave-reference = {{ slave_instance.get('slave_reference') }}
{% else -%} {% else -%}
{% do slave_instance_information_list.append({'slave-reference':slave_instance.get('slave_reference'), 'public-ipv4':public_ipv4}) -%} {% do slave_instance_information_list.append({'slave-reference':slave_instance.get('slave_reference'), 'public-ipv4':public_ipv4}) -%}
{% endif -%} {% endif -%}
......
...@@ -90,7 +90,7 @@ value = {{ dumps(slave_instance.get(cert_name)) }} ...@@ -90,7 +90,7 @@ value = {{ dumps(slave_instance.get(cert_name)) }}
{% do part_list.append(publish_section_title) -%} {% do part_list.append(publish_section_title) -%}
[{{ publish_section_title }}] [{{ publish_section_title }}]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
slave-reference = {{ slave_instance.get('slave_reference') }} -slave-reference = {{ slave_instance.get('slave_reference') }}
public-ipv4 = {{ public_ipv4 }} public-ipv4 = {{ public_ipv4 }}
domain = {{ slave_instance.get('domain') }} domain = {{ slave_instance.get('domain') }}
url = http://{{ slave_instance.get('domain') }} url = http://{{ slave_instance.get('domain') }}
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
{% do part_list.append(publish_section_title) -%} {% do part_list.append(publish_section_title) -%}
[{{ publish_section_title }}] [{{ publish_section_title }}]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
slave-reference = {{ slave_reference }} -slave-reference = {{ slave_reference }}
{% for key, value in slave_information.iteritems() -%} {% for key, value in slave_information.iteritems() -%}
{{ key }} = {{ value }} {{ key }} = {{ value }}
{% endfor -%} {% endfor -%}
......
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