Commit c6616710 authored by Joanne Hugé's avatar Joanne Hugé

ors-amarisoft: make optional requests and fix jinja linebreak

parent bebe0059
...@@ -20,7 +20,7 @@ md5sum = 6e5c63c35b13f8920ea13e24c27d7b50 ...@@ -20,7 +20,7 @@ md5sum = 6e5c63c35b13f8920ea13e24c27d7b50
[template-lte-enb-epc] [template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg _update_hash_filename_ = instance-enb-epc.jinja2.cfg
md5sum = 7f8f92ff218c40c843a102953c7695f8 md5sum = 80a239305950ed76b5279647f422478f
[template-lte-enb] [template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
...@@ -28,11 +28,11 @@ md5sum = 04dbc8396cb112e86d5d1564df033b82 ...@@ -28,11 +28,11 @@ md5sum = 04dbc8396cb112e86d5d1564df033b82
[template-lte-gnb-epc] [template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
md5sum = d83b5569e258770774cb6028d93a4a70 md5sum = dadb76e747faeea18c387109c3319dfd
[template-lte-epc] [template-lte-epc]
_update_hash_filename_ = instance-epc.jinja2.cfg _update_hash_filename_ = instance-epc.jinja2.cfg
md5sum = d310dee0de054e10d77f036199297b3f md5sum = 9ffc54bf10757403c4b1809d1102ea52
[template-lte-gnb] [template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
......
...@@ -48,7 +48,7 @@ promise = ${:etc}/promise ...@@ -48,7 +48,7 @@ promise = ${:etc}/promise
log = ${:var}/log log = ${:var}/log
[request-common-base] [request-common-base]
recipe = slapos.cookbook:request.serialised recipe = slapos.cookbook:requestoptional.serialised
software-url = {{ slap_connection['software-release-url'] }} software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }} server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }} computer-id = {{ slap_connection['computer-id'] }}
...@@ -67,7 +67,7 @@ software-type = mme ...@@ -67,7 +67,7 @@ software-type = mme
config-name = mme config-name = mme
{%- for key, value in slapparameter_dict.items() %} {%- for key, value in slapparameter_dict.items() %}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor %}
config-slave-list = {{ dumps(slave_instance_list) }} config-slave-list = {{ dumps(slave_instance_list) }}
return = monitor-base-url epc-ipv6 return = monitor-base-url epc-ipv6
......
...@@ -47,7 +47,7 @@ promise = ${:etc}/promise ...@@ -47,7 +47,7 @@ promise = ${:etc}/promise
log = ${:var}/log log = ${:var}/log
[request-common-base] [request-common-base]
recipe = slapos.cookbook:request.serialised recipe = slapos.cookbook:requestoptional.serialised
software-url = {{ slap_connection['software-release-url'] }} software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }} server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }} computer-id = {{ slap_connection['computer-id'] }}
...@@ -67,7 +67,7 @@ software-type = mme ...@@ -67,7 +67,7 @@ software-type = mme
config-name = mme config-name = mme
{%- for key, value in slapparameter_dict.items() %} {%- for key, value in slapparameter_dict.items() %}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor %}
config-slave-list = {{ dumps(slave_instance_list) }} config-slave-list = {{ dumps(slave_instance_list) }}
[monitor-base-url-dict] [monitor-base-url-dict]
......
...@@ -48,7 +48,7 @@ promise = ${:etc}/promise ...@@ -48,7 +48,7 @@ promise = ${:etc}/promise
log = ${:var}/log log = ${:var}/log
[request-common-base] [request-common-base]
recipe = slapos.cookbook:request.serialised recipe = slapos.cookbook:requestoptional.serialised
software-url = {{ slap_connection['software-release-url'] }} software-url = {{ slap_connection['software-release-url'] }}
server-url = {{ slap_connection['server-url'] }} server-url = {{ slap_connection['server-url'] }}
computer-id = {{ slap_connection['computer-id'] }} computer-id = {{ slap_connection['computer-id'] }}
...@@ -78,7 +78,7 @@ software-type = gnb ...@@ -78,7 +78,7 @@ software-type = gnb
config-name = gnb config-name = gnb
{%- for key, value in slapparameter_dict.items() %} {%- for key, value in slapparameter_dict.items() %}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor %}
return = monitor-base-url return = monitor-base-url
[monitor-base-url-dict] [monitor-base-url-dict]
......
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