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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Blinov
slapos
Commits
392f3ead
Commit
392f3ead
authored
Dec 09, 2015
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apache-frontend: Include backward compatibility with RootSoftwareInstance.
parent
b7f00def
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+2
-2
software/apache-frontend/instance-apache-replicate.cfg.in
software/apache-frontend/instance-apache-replicate.cfg.in
+4
-3
software/apache-frontend/instance.cfg
software/apache-frontend/instance.cfg
+1
-0
No files found.
software/apache-frontend/common.cfg
View file @
392f3ead
...
@@ -58,7 +58,7 @@ command =
...
@@ -58,7 +58,7 @@ command =
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
5c22b1e0fe601255ebf19adf6093489f
md5sum =
16b22ef9b0476352e2e5b68f5966ce62
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
...
@@ -72,7 +72,7 @@ mode = 0644
...
@@ -72,7 +72,7 @@ mode = 0644
[template-apache-replicate]
[template-apache-replicate]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
md5sum =
bf3de2d814110d4af8efb5b7b165665b
md5sum =
c495395bf4cae93ff665c5e74e6d4583
mode = 0644
mode = 0644
[template-slave-list]
[template-slave-list]
...
...
software/apache-frontend/instance-apache-replicate.cfg.in
View file @
392f3ead
...
@@ -14,9 +14,9 @@ context =
...
@@ -14,9 +14,9 @@ context =
{% set part_list = [] -%}
{% set part_list = [] -%}
{% set single_type_key = 'single-' %}
{% set single_type_key = 'single-' %}
{% if slap_software_type
in ("replicate", "RootSoftwareInstance")
%}
{% if slap_software_type
== "replicate"
%}
{% set frontend_type = slapparameter_dict.pop('-frontend-type', '
custom-personal
') -%}
{% set frontend_type = slapparameter_dict.pop('-frontend-type', '
single-default
') -%}
{% elif slap_software_type
== 'default'
-%}
{% elif slap_software_type
in ['default', 'RootSoftwareInstance']
-%}
{% set frontend_type = "%s%s" % (single_type_key, 'custom-personal') -%}
{% set frontend_type = "%s%s" % (single_type_key, 'custom-personal') -%}
{% else -%}
{% else -%}
{% set frontend_type = "%s%s" % (single_type_key, slap_software_type) -%}
{% set frontend_type = "%s%s" % (single_type_key, slap_software_type) -%}
...
@@ -131,6 +131,7 @@ rejected-slave-list = {{ json_module.dumps(rejected_slave_list) }}
...
@@ -131,6 +131,7 @@ rejected-slave-list = {{ json_module.dumps(rejected_slave_list) }}
[publish-slave-information]
[publish-slave-information]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
default = ${dynamic-publish-slave-information:rendered}
default = ${dynamic-publish-slave-information:rendered}
RootSoftwareInstance = ${dynamic-publish-slave-information:rendered}
replicate = ${dynamic-publish-slave-information:rendered}
replicate = ${dynamic-publish-slave-information:rendered}
custom-personal = ${dynamic-publish-slave-information:rendered}
custom-personal = ${dynamic-publish-slave-information:rendered}
custom-group = ${dynamic-publish-slave-information:rendered}
custom-group = ${dynamic-publish-slave-information:rendered}
...
...
software/apache-frontend/instance.cfg
View file @
392f3ead
...
@@ -31,6 +31,7 @@ context =
...
@@ -31,6 +31,7 @@ context =
[switch-softwaretype]
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
default = $${dynamic-template-apache-replicate:rendered}
default = $${dynamic-template-apache-replicate:rendered}
RootSoftwareInstance = $${dynamic-template-apache-replicate:rendered}
custom-personal = $${dynamic-template-apache-replicate:rendered}
custom-personal = $${dynamic-template-apache-replicate:rendered}
custom-group = $${dynamic-template-apache-replicate:rendered}
custom-group = $${dynamic-template-apache-replicate:rendered}
single-default = ${template-apache-frontend:output}
single-default = ${template-apache-frontend:output}
...
...
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