Commit 4f8f6c31 authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'upstream/master' into zope4py2

parents 3e7fa910 bad7c710
Pipeline #24013 failed with stage
in 0 seconds
...@@ -22,7 +22,7 @@ eggs = ...@@ -22,7 +22,7 @@ eggs =
<= go-git-package <= go-git-package
go.importpath = lab.nexedi.com/nexedi/galene go.importpath = lab.nexedi.com/nexedi/galene
repository = https://lab.nexedi.com/nexedi/galene.git repository = https://lab.nexedi.com/nexedi/galene.git
revision = 6669a93ae39ad83b8b3a222dd8210dfef8a7ed02 revision = galene-0.6
[gowork] [gowork]
install = install =
......
...@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c ...@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c
[template-lte-enb] [template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 34026b07bdd850dd3fb3ffff5377a0c2 md5sum = 7f101e9777fb53e06e9138b3be562a68
[template-lte-gnb-epc] [template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
...@@ -36,7 +36,7 @@ md5sum = b17674f523adce9b0dda942c1493674d ...@@ -36,7 +36,7 @@ md5sum = b17674f523adce9b0dda942c1493674d
[template-lte-gnb] [template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg _update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = 7acdbad30c130faa3bce49b04b2c0c2f md5sum = 69faf2e00fd0beb906bf11f40a4e4d91
[template-lte-mme] [template-lte-mme]
_update_hash_filename_ = instance-mme.jinja2.cfg _update_hash_filename_ = instance-mme.jinja2.cfg
...@@ -87,9 +87,9 @@ filename = config/ue-nr.jinja2.cfg ...@@ -87,9 +87,9 @@ filename = config/ue-nr.jinja2.cfg
md5sum = 2082bcb28d9be653225ce6db46dc236a md5sum = 2082bcb28d9be653225ce6db46dc236a
[sdr-busy-promise] [sdr-busy-promise]
_update_hash_filename_ = promise/check_sdr_busy.jinja2.py _update_hash_filename_ = promise/check_sdr_busy.py
md5sum = 93dacb1da15310eb70d0815711a06cdf md5sum = e5853b4fecae68debcb7b32d3c13368c
[interface-up-promise] [interface-up-promise]
_update_hash_filename_ = promise/check_interface_up.py _update_hash_filename_ = promise/check_interface_up.py
md5sum = cbe3ac5d123e38cc6adf168f39cc8189 md5sum = 7797aeaf02e055226249f2c08209775a
...@@ -129,17 +129,10 @@ monitor-title = {{ slapparameter_dict['name'] | string }} ...@@ -129,17 +129,10 @@ monitor-title = {{ slapparameter_dict['name'] | string }}
password = {{ slapparameter_dict['monitor-password'] | string }} password = {{ slapparameter_dict['monitor-password'] | string }}
{% endif %} {% endif %}
[sdr-busy-promise-template]
recipe = slapos.recipe.template:jinja2
url = {{ sdr_busy_promise }}
output = ${directory:etc}/check-sdr-busy.py
extensions = jinja2.ext.do
context =
key slapparameter_dict slap-configuration:configuration
# Add custom promise to check if /dev/sdr0 is busy # Add custom promise to check if /dev/sdr0 is busy
[sdr-busy-promise] [sdr-busy-promise]
recipe = slapos.cookbook:promise.plugin recipe = slapos.cookbook:promise.plugin
eggs = slapos.core eggs = slapos.core
file = ${sdr-busy-promise-template:output} file = {{ sdr_busy_promise }}
output = ${directory:plugins}/check-sdr-busy.py output = ${directory:plugins}/check-sdr-busy.py
config-testing = {{ slapparameter_dict.get("testing", False) }}
...@@ -129,17 +129,10 @@ monitor-title = {{ slapparameter_dict['name'] | string }} ...@@ -129,17 +129,10 @@ monitor-title = {{ slapparameter_dict['name'] | string }}
password = {{ slapparameter_dict['monitor-password'] | string }} password = {{ slapparameter_dict['monitor-password'] | string }}
{% endif %} {% endif %}
[sdr-busy-promise-template]
recipe = slapos.recipe.template:jinja2
url = {{ sdr_busy_promise }}
output = ${directory:etc}/check-sdr-busy.py
extensions = jinja2.ext.do
context =
key slapparameter_dict slap-configuration:configuration
# Add custom promise to check if /dev/sdr0 is busy # Add custom promise to check if /dev/sdr0 is busy
[sdr-busy-promise] [sdr-busy-promise]
recipe = slapos.cookbook:promise.plugin recipe = slapos.cookbook:promise.plugin
eggs = slapos.core eggs = slapos.core
file = ${sdr-busy-promise-template:output} file = {{ sdr_busy_promise }}
output = ${directory:plugins}/check-sdr-busy.py output = ${directory:plugins}/check-sdr-busy.py
config-testing = {{ slapparameter_dict.get("testing", False) }}
...@@ -28,7 +28,7 @@ class RunPromise(GenericPromise): ...@@ -28,7 +28,7 @@ class RunPromise(GenericPromise):
In this case, check whether the file exists. In this case, check whether the file exists.
""" """
ifname = self.getConfig('ifname') ifname = self.getConfig('ifname')
testing = self.getConfig('testing') testing = self.getConfig('testing') == "True"
if testing: if testing:
self.logger.info("skipping promise") self.logger.info("skipping promise")
......
...@@ -28,6 +28,7 @@ class RunPromise(GenericPromise): ...@@ -28,6 +28,7 @@ class RunPromise(GenericPromise):
In this case, check whether the file exists. In this case, check whether the file exists.
""" """
testing = {{ slapparameter_dict.get('testing', False) }} testing = {{ slapparameter_dict.get('testing', False) }}
testing = self.getConfig('testing') == "True"
sdr_dev = '/dev/sdr0' sdr_dev = '/dev/sdr0'
if testing: if testing:
......
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