Commit 3ebd1690 authored by Łukasz Nowak's avatar Łukasz Nowak

caucase: Fix monitoring

Adding monitor stack allows to use the monitor, then passing the profile and
extending it allows to correctly deploy.
parent 7b50ba70
Pipeline #13518 failed with stage
in 0 seconds
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
# not need these here). # not need these here).
[instance-caucased] [instance-caucased]
filename = instance-caucased.cfg.jinja2 filename = instance-caucased.cfg.jinja2
md5sum = 2277c891a71534e00487468f5048d196 md5sum = 8081efb41f12592033283db9841178ea
[instance] [instance]
filename = instance.cfg.jinja2 filename = instance.cfg.jinja2
md5sum = d40bed5ccc457ff7dc99b618bf29b189 md5sum = 687ed460bebc18768ff7b7315e9b6de5
...@@ -27,3 +27,4 @@ parts = ...@@ -27,3 +27,4 @@ parts =
publish publish
caucased caucased
caucased-promise caucased-promise
extends = {{ template_monitor }}
...@@ -20,10 +20,12 @@ instance-caucased = {{ dumps(instance_caucased) }} ...@@ -20,10 +20,12 @@ instance-caucased = {{ dumps(instance_caucased) }}
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${context:instance-caucased} template = ${context:instance-caucased}
rendered = ${buildout:parts-directory}/instance-caucased.cfg rendered = ${buildout:parts-directory}/instance-caucased.cfg
monitor = {{ template_monitor }}
context = context =
key ipv6_set slap-configuration:ipv6 key ipv6_set slap-configuration:ipv6
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
key bin_directory context:bin-directory key bin_directory context:bin-directory
key template_monitor :monitor
import-list = import-list =
file caucase context:caucase-jinja2-library file caucase context:caucase-jinja2-library
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
extends = extends =
buildout.hash.cfg buildout.hash.cfg
../../stack/caucase/buildout.cfg ../../stack/caucase/buildout.cfg
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
parts += parts +=
instance instance
...@@ -24,3 +26,4 @@ context = ...@@ -24,3 +26,4 @@ context =
key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
key caucase_jinja2_library caucase-jinja2-library:target key caucase_jinja2_library caucase-jinja2-library:target
key instance_caucased instance-caucased:target key instance_caucased instance-caucased:target
key template_monitor monitor2-template:rendered
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