software/caucase: Trivial simplification.

e1a7ca20 · Vincent Pelletier · Matevz Golob · 10da0f8f · e1a7ca20 · e1a7ca20
Commit e1a7ca20 authored Jun 28, 2019 by Vincent Pelletier Committed by Matevz Golob Jul 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

software/caucase/buildout.hash.cfg software/caucase/buildout.hash.cfg +1 -1

software/caucase/instance-caucased.cfg.jinja2 software/caucase/instance-caucased.cfg.jinja2 +1 -2

No files found.
--- a/software/caucase/buildout.hash.cfg
+++ b/software/caucase/buildout.hash.cfg
@@ -15,7 +15,7 @@
 # not need these here).
 [instance-caucased]
 filename = instance-caucased.cfg.jinja2
-md5sum = 31dc85cce6e419235a92c3c7682a89d1
+md5sum = 442e17a66b6f8d39f87903e147e3edaf
 [instance]
 filename = instance.cfg.jinja2

--- a/software/caucase/instance-caucased.cfg.jinja2
+++ b/software/caucase/instance-caucased.cfg.jinja2
 {% import "caucase" as caucase with context %}
-{% set ipv6 = (ipv6_set | list)[0] -%}
+{% set netloc = '[' ~ (ipv6_set | list)[0] ~ ']:' ~ slapparameter_dict.get('base-port', 8009) -%}
-{% set netloc = '[' ~ ipv6 ~ ']:' ~ slapparameter_dict.get('base-port', 8009) -%}
 [directory]
 recipe = slapos.cookbook:mkdirectory