Commit 32df49b3 authored by Bryton Lacquement's avatar Bryton Lacquement 🚪 Committed by Thomas Gambier

powerdns: softwaretype -> switch-softwaretype

parent 214e1399
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 863fdbee998fd4f69fe359667768e33c md5sum = fddea033e1aa9d6147a1a47bd7cc4b62
[template-powerdns] [template-powerdns]
filename = instance-powerdns.cfg filename = instance-powerdns.cfg
...@@ -26,7 +26,7 @@ md5sum = e45d72de87b4adb89c195ba463be4077 ...@@ -26,7 +26,7 @@ md5sum = e45d72de87b4adb89c195ba463be4077
[template-dns-replicate] [template-dns-replicate]
_update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2 _update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
md5sum = 670bac1a8463e08814db82a81ddae1bf md5sum = a23e241a236f90ae1afbb5bd5ba0b32d
[iso-list] [iso-list]
_update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd _update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd
......
...@@ -151,7 +151,7 @@ key_file = ${slap-connection:key-file} ...@@ -151,7 +151,7 @@ key_file = ${slap-connection:key-file}
cert_file = ${slap-connection:cert-file} cert_file = ${slap-connection:cert-file}
[slap-parameter] [slap-parameter]
slave_instance_list = {% for k, v in slapparameter_dict.items() -%}
-dns-quantity = 1 {{ k }} = {{ v }}
-dns-type = single-default {% endfor -%}
{%- endif %} {%- endif %}
...@@ -8,10 +8,12 @@ offline = true ...@@ -8,10 +8,12 @@ offline = true
[switch-softwaretype] [switch-softwaretype]
recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:switch-softwaretype
default = $${dynamic-powerdns-replicate:rendered} default = dynamic-powerdns-replicate:rendered
single-default = $${dynamic-template-powerdns:rendered} single-default = dynamic-template-powerdns:rendered
# BBB
RootSoftwareInstance = $${:default}
[jinja2-template-base] [jinja2-template-base]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -21,9 +23,9 @@ context = ...@@ -21,9 +23,9 @@ context =
import json_module json import json_module json
key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
key slap_software_type slap-parameters:slap-software-type key slap_software_type slap-configuration:slap-software-type
key slapparameter_dict slap-parameters:configuration key slapparameter_dict slap-configuration:configuration
key slave_instance_list slap-parameters:slave-instance-list key slave_instance_list slap-configuration:slave-instance-list
$${:extra-context} $${:extra-context}
[dynamic-template-powerdns] [dynamic-template-powerdns]
...@@ -45,7 +47,7 @@ extra-context = ...@@ -45,7 +47,7 @@ extra-context =
raw software_type RootSoftwareInstance-default raw software_type RootSoftwareInstance-default
raw template_monitor ${monitor2-template:rendered} raw template_monitor ${monitor2-template:rendered}
[slap-parameters] [slap-configuration]
recipe = slapos.cookbook:slapconfiguration recipe = slapos.cookbook:slapconfiguration
computer = $${slap-connection:computer-id} computer = $${slap-connection:computer-id}
partition = $${slap-connection:partition-id} partition = $${slap-connection:partition-id}
......
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