ors-amarisoft: attach SIM cards on master instance

8f280e9a · Joanne Hugé · 94bf8492 · 8f280e9a · 8f280e9a
Commit 8f280e9a authored Jul 05, 2022 by Joanne Hugé
Showing with 4 additions and 1 deletion

software/ors-amarisoft/buildout.hash.cfg software/ors-amarisoft/buildout.hash.cfg +1 -1

software/ors-amarisoft/instance-epc.jinja2.cfg software/ors-amarisoft/instance-epc.jinja2.cfg +3 -0

No files found.
--- a/software/ors-amarisoft/buildout.hash.cfg
+++ b/software/ors-amarisoft/buildout.hash.cfg
@@ -32,7 +32,7 @@ md5sum = 4a258326fe571790e07a0e903d94fde0

 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = 1039c60e2dcb8ef144a8c56e34acce9b
+md5sum = f98ee57d1c470330af9bb9018919cc63

 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

--- a/software/ors-amarisoft/instance-epc.jinja2.cfg
+++ b/software/ors-amarisoft/instance-epc.jinja2.cfg
@@ -62,4 +62,7 @@ lte-mme-request =  ${lte-mme-request:connection-monitor-base-url}
 [publish-connection-information]
 recipe = slapos.cookbook:publish.serialised
 <= monitor-publish
+<<<<<<< HEAD
 epc-ip =  ${lte-mme-request:connection-epc-ip}
+=======
+>>>>>>> ors-amarisoft: attach SIM cards on master instance