Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
8d93d403
Commit
8d93d403
authored
Jan 24, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
re6stnet-registry: Include monitor stack
parent
594258d3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
software/re6stnet/instance-re6stnet.cfg.in
software/re6stnet/instance-re6stnet.cfg.in
+2
-0
software/re6stnet/instance.cfg.in
software/re6stnet/instance.cfg.in
+1
-0
software/re6stnet/software.cfg
software/re6stnet/software.cfg
+7
-3
No files found.
software/re6stnet/instance-re6stnet.cfg.in
View file @
8d93d403
...
@@ -222,6 +222,7 @@ recipe = slapos.cookbook:publish
...
@@ -222,6 +222,7 @@ recipe = slapos.cookbook:publish
[buildout]
[buildout]
extends =
extends =
{{ monitor2_template_rendered }}
{{ logrotate_cfg }}
{{ logrotate_cfg }}
parts =
parts =
...
@@ -239,6 +240,7 @@ parts =
...
@@ -239,6 +240,7 @@ parts =
re6st-registry-promise
re6st-registry-promise
apache-registry-promise
apache-registry-promise
monitor-base
# Complete parts with sections
# Complete parts with sections
{{ part_list | join('\n ') }}
{{ part_list | join('\n ') }}
...
...
software/re6stnet/instance.cfg.in
View file @
8d93d403
...
@@ -44,6 +44,7 @@ filename = instance-re6stnet.cfg
...
@@ -44,6 +44,7 @@ filename = instance-re6stnet.cfg
extensions = jinja2.ext.do
extensions = jinja2.ext.do
extra-context =
extra-context =
section parameter_dict dynamic-template-re6stnet-parameters
section parameter_dict dynamic-template-re6stnet-parameters
raw monitor2_template_rendered {{ monitor2_template_rendered }}
[switch-softwaretype]
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
...
...
software/re6stnet/software.cfg
View file @
8d93d403
...
@@ -12,7 +12,10 @@ extends =
...
@@ -12,7 +12,10 @@ extends =
../../component/python-cryptography/buildout.cfg
../../component/python-cryptography/buildout.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
parts =
# Monitoring stack (keep on bottom)
../../stack/monitor/buildout.cfg
parts +=
slapos-cookbook-develop
slapos-cookbook-develop
slapos-cookbook
slapos-cookbook
eggs
eggs
...
@@ -65,7 +68,7 @@ context =
...
@@ -65,7 +68,7 @@ context =
< = template-jinja2-base
< = template-jinja2-base
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
1f39ec8d7d91c0ba2b4ad56f27ebac39
md5sum =
84387d5af13561447c1170704a2076a6
extra-context =
extra-context =
key apache_location apache:location
key apache_location apache:location
key dash_location dash:location
key dash_location dash:location
...
@@ -76,12 +79,13 @@ extra-context =
...
@@ -76,12 +79,13 @@ extra-context =
key template_re6st_registry_conf template-re6st-registry-conf:target
key template_re6st_registry_conf template-re6st-registry-conf:target
key template_logrotate_base template-logrotate-base:rendered
key template_logrotate_base template-logrotate-base:rendered
key template_wrapper template-wrapper:target
key template_wrapper template-wrapper:target
key monitor2_template_rendered monitor2-template:rendered
raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
[template-re6stnet]
[template-re6stnet]
< = download-base
< = download-base
filename = instance-re6stnet.cfg.in
filename = instance-re6stnet.cfg.in
md5sum =
1f074a64d330e62213810a023ebce01e
md5sum =
b7461975e29fc6ed03637dae7e9b6e25
[template-logrotate-base]
[template-logrotate-base]
< = template-jinja2-base
< = template-jinja2-base
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment