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
Tristan Cavelier
slapos
Commits
9d768e8f
Commit
9d768e8f
authored
Nov 18, 2014
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
request: drop redundant 'config' & 'sla' options
parent
31d2714e
Changes
45
Hide whitespace changes
Inline
Side-by-side
Showing
45 changed files
with
50 additions
and
151 deletions
+50
-151
setup.py
setup.py
+1
-1
slapos/recipe/request.py
slapos/recipe/request.py
+12
-17
software/ajaxplorer/instance-apachephp.cfg
software/ajaxplorer/instance-apachephp.cfg
+0
-4
software/ajaxplorer/software.cfg
software/ajaxplorer/software.cfg
+1
-1
software/apache-frontend/common.cfg
software/apache-frontend/common.cfg
+1
-1
software/apache-frontend/instance-apache-replicate.cfg.in
software/apache-frontend/instance-apache-replicate.cfg.in
+0
-2
software/davstorage/common.cfg
software/davstorage/common.cfg
+1
-1
software/davstorage/instance-davstorage.cfg
software/davstorage/instance-davstorage.cfg
+0
-2
software/etherpad-lite/common.cfg
software/etherpad-lite/common.cfg
+1
-1
software/etherpad-lite/instance-etherpad-lite.cfg
software/etherpad-lite/instance-etherpad-lite.cfg
+0
-1
software/kvm/common.cfg
software/kvm/common.cfg
+2
-2
software/kvm/instance-kvm-resilient-test.cfg.jinja2
software/kvm/instance-kvm-resilient-test.cfg.jinja2
+1
-4
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+0
-2
software/monitor/instance.cfg
software/monitor/instance.cfg
+0
-1
software/monitor/software.cfg
software/monitor/software.cfg
+1
-1
software/neoppod/cluster.cfg.in
software/neoppod/cluster.cfg.in
+2
-11
software/neoppod/software.cfg
software/neoppod/software.cfg
+1
-1
software/powerdns/instance-powerdns-replicate.cfg.jinja2
software/powerdns/instance-powerdns-replicate.cfg.jinja2
+2
-6
software/powerdns/software.cfg
software/powerdns/software.cfg
+1
-1
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/instance-resilient-test.cfg.jinja2
software/slaprunner/instance-resilient-test.cfg.jinja2
+1
-4
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+2
-8
software/test-slave-instance-deployment/instance-default.cfg
software/test-slave-instance-deployment/instance-default.cfg
+0
-1
software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in
...table/hexaglobe-watermarking/instance-watermarking.cfg.in
+0
-1
software/unstable/lamp-generic/instance-apache-php.cfg.in
software/unstable/lamp-generic/instance-apache-php.cfg.in
+0
-1
software/unstable/lamp-generic/instance-edge.cfg.in
software/unstable/lamp-generic/instance-edge.cfg.in
+0
-1
software/unstable/lamp-generic/software.cfg
software/unstable/lamp-generic/software.cfg
+1
-1
software/unstable/mioga/instance-apacheperl.cfg
software/unstable/mioga/instance-apacheperl.cfg
+0
-2
software/unstable/trac-svn/instance-trac.cfg
software/unstable/trac-svn/instance-trac.cfg
+0
-2
software/unstable/trac-svn/software.cfg
software/unstable/trac-svn/software.cfg
+1
-1
software/unstable/zimbra-kvm/instance-kvm.cfg.in
software/unstable/zimbra-kvm/instance-kvm.cfg.in
+0
-4
stack/boinc/buildout.cfg
stack/boinc/buildout.cfg
+1
-1
stack/boinc/instance-boinc.cfg
stack/boinc/instance-boinc.cfg
+0
-1
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-3
stack/erp5/instance-erp5-cluster.cfg.in
stack/erp5/instance-erp5-cluster.cfg.in
+0
-12
stack/erp5/instance-erp5-single.cfg.in
stack/erp5/instance-erp5-single.cfg.in
+0
-2
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+0
-2
stack/lamp/apache/instance-apache-php.cfg.in
stack/lamp/apache/instance-apache-php.cfg.in
+0
-2
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+2
-2
stack/lamp/instance-resilient.cfg.jinja2
stack/lamp/instance-resilient.cfg.jinja2
+0
-1
stack/lapp/apache/instance-apache-php.cfg.in
stack/lapp/apache/instance-apache-php.cfg.in
+0
-2
stack/lapp/buildout.cfg
stack/lapp/buildout.cfg
+2
-2
stack/lapp/instance-resilient.cfg.jinja2
stack/lapp/instance-resilient.cfg.jinja2
+0
-1
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg
+2
-2
stack/resilient/template-replicated.cfg.in
stack/resilient/template-replicated.cfg.in
+6
-30
No files found.
setup.py
View file @
9d768e8f
...
...
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import
glob
import
os
version
=
'0.9
0
'
version
=
'0.9
1
'
name
=
'slapos.cookbook'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
slapos/recipe/request.py
View file @
9d768e8f
...
...
@@ -25,6 +25,7 @@
#
##############################################################################
import
logging
from
zc.buildout
import
UserError
from
slapos.recipe.librecipe
import
wrap
,
JSON_SERIALISED_MAGIC_KEY
import
json
from
slapos
import
slap
as
slapmodule
...
...
@@ -33,12 +34,6 @@ import traceback
DEFAULT_SOFTWARE_TYPE
=
'RootSoftwareInstance'
def
getListOption
(
option_dict
,
key
,
default
=
()):
result
=
option_dict
.
get
(
key
,
default
)
if
isinstance
(
result
,
basestring
):
result
=
result
.
split
()
return
result
class
Recipe
(
object
):
"""
Request a partition to a slap master.
...
...
@@ -104,19 +99,20 @@ class Recipe(object):
self
.
logger
=
logging
.
getLogger
(
name
)
software_url
=
options
[
'software-url'
]
name
=
options
[
'name'
]
return_parameters
=
getListOption
(
options
,
'return'
)
return_parameters
=
options
.
get
(
'return'
,
''
).
split
(
)
if
not
return_parameters
:
self
.
logger
.
debug
(
"No parameter to return to main instance."
"Be careful about that..."
)
software_type
=
options
.
get
(
'software-type'
,
DEFAULT_SOFTWARE_TYPE
)
filter_kw
=
dict
(
(
x
,
options
[
'sla-'
+
x
])
for
x
in
getListOption
(
options
,
'sla'
)
if
options
[
'sla-'
+
x
]
)
partition_parameter_kw
=
self
.
_filterForStorage
(
dict
(
(
x
,
options
[
'config-'
+
x
])
for
x
in
getListOption
(
options
,
'config'
)
))
if
'config'
in
options
or
'sla'
in
options
:
raise
UserError
(
"'config' & 'sla' options are obsolete."
" Clean up your software release."
)
filter_kw
=
{
k
:
v
for
k
,
v
in
options
.
iteritems
()
if
k
.
startswith
(
'sla-'
)
and
v
}
partition_parameter_kw
=
self
.
_filterForStorage
({
k
:
v
for
k
,
v
in
options
.
iteritems
()
if
k
.
startswith
(
'config-'
)})
slave
=
options
.
get
(
'slave'
,
'false'
).
lower
()
in
\
librecipe
.
GenericBaseRecipe
.
TRUE_VALUES
...
...
@@ -267,9 +263,8 @@ class RequestEdge(Recipe):
# Request will have its own copy of options dict
local_options
=
original_options
.
copy
()
local_options
[
'name'
]
=
'%s-%s'
%
(
country
,
name
)
local_options
[
'sla'
]
=
"region"
local_options
[
'sla-region'
]
=
country
self
.
request_dict
[
country
]
=
Recipe
(
buildout
,
name
,
local_options
)
# "Bubble" all connection parameters
for
option
,
value
in
local_options
.
iteritems
():
...
...
software/ajaxplorer/instance-apachephp.cfg
View file @
9d768e8f
...
...
@@ -177,7 +177,6 @@ name = MariaDB
software-url = $${slap-connection:software-release-url}
software-type = mariadb
return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id}
[mariadb-urlparse]
...
...
@@ -260,7 +259,6 @@ name = Frontend-Website
# XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url}
slave = true
config = url custom_domain
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
config-custom_domain = $${slap-parameter:domain}
...
...
@@ -272,7 +270,6 @@ name = Frontend-FileManager
# XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url}
slave = true
config = url custom_domain
config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port2}/
return = site_url
config-custom_domain = $${slap-parameter:domain2}
...
...
@@ -284,7 +281,6 @@ name = Frontend-Website2
# XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url}
slave = true
config = url custom_domain
config-url = http://[$${httpd-conf:ip}]:$${httpd-conf:port3}/
return = site_url
config-custom_domain = $${slap-parameter:domain3}
...
...
software/ajaxplorer/software.cfg
View file @
9d768e8f
...
...
@@ -35,7 +35,7 @@ md5sum = 4c7936accb3658871b635158198b7905
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apachephp.cfg
output = ${buildout:directory}/template-apachephp.cfg
md5sum =
ef5c61127a21c016014021477d1791e3
md5sum =
8be713bd2656e184651c8ec10579d668
mode = 0644
[instance-mariadb]
...
...
software/apache-frontend/common.cfg
View file @
9d768e8f
...
...
@@ -74,7 +74,7 @@ mode = 0644
[template-apache-replicate]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
md5sum =
140b3be4ce46aa18b33aea5d379d90e9
md5sum =
aafa98333cd51025938b33c2516f0b8d
mode = 0644
[template-slave-list]
...
...
software/apache-frontend/instance-apache-replicate.cfg.in
View file @
9d768e8f
...
...
@@ -86,7 +86,6 @@ software-url = ${slap-connection:software-release-url}
{% endif %}
software-type = {{frontend_type}}
return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url
config = _
connection-monitor_url =
{% for section, frontend_request in request_dict.iteritems() %}
...
...
@@ -102,7 +101,6 @@ state = {{ frontend_request.get('state') }}
{% do slave_configuration_dict.__setitem__("frontend-name", frontend_request.get('name')) %}
config-_ = {{ json_module.dumps(slave_configuration_dict) }}
{% if frontend_request.get('sla') %}
sla = {{ ' '.join(frontend_request.get('sla').keys()) }}
{% for parameter, value in frontend_request.get('sla').iteritems() -%}
sla-{{ parameter }} = {{ value }}
{% endfor -%}
...
...
software/davstorage/common.cfg
View file @
9d768e8f
...
...
@@ -44,6 +44,6 @@ mode = 0644
[instance-davstorage]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-davstorage.cfg
md5sum =
699ecf4678386667f58a3391bab7af0f
md5sum =
b83b0351a0f46aac35d52e681270ff03
output = ${buildout:directory}/template-davstorage.cfg
mode = 0644
software/davstorage/instance-davstorage.cfg
View file @
9d768e8f
...
...
@@ -166,7 +166,6 @@ name = Frontend Ajax
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url https-only
config-https-only = true
config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
return = domain
...
...
@@ -178,7 +177,6 @@ name = Frontend Webdav
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url https-only
config-https-only = true
config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
return = domain
...
...
software/etherpad-lite/common.cfg
View file @
9d768e8f
...
...
@@ -58,7 +58,7 @@ mode = 0644
[instance-etherpad-lite]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-etherpad-lite.cfg
md5sum =
fd7249be8988155110234c7bb877abb9
md5sum =
28710a9a23320dd472387d81a698d12d
output = ${buildout:directory}/template-etherpad-lite.cfg
mode = 0644
...
...
software/etherpad-lite/instance-etherpad-lite.cfg
View file @
9d768e8f
...
...
@@ -67,7 +67,6 @@ name = Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url
config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
return = site_url
...
...
software/kvm/common.cfg
View file @
9d768e8f
...
...
@@ -92,7 +92,7 @@ mode = 0644
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
md5sum =
e16c15f72fdeb92ce1854bc25daf5ad7
md5sum =
ac69266206830226185e576fb6e4935a
download-only = true
on-update = true
...
...
@@ -107,7 +107,7 @@ on-update = true
[template-kvm-resilient-test]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm-resilient-test.cfg.jinja2
md5sum =
b4894680283d3912df4e9740f3e7848b
md5sum =
080b5790b95a979e44c4a8e26dc02835
mode = 0644
download-only = true
on-update = true
...
...
software/kvm/instance-kvm-resilient-test.cfg.jinja2
View file @
9d768e8f
...
...
@@ -42,16 +42,13 @@ recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url}
software-type = kvm-resilient
name = Resilient KVM (Root Instance)
{% set cluster_parameter_dict = slapparameter_dict.get('cluster', {}) -%}
config = virtual-hard-drive-url virtual-hard-drive-md5sum resiliency-backup-periodicity {{ cluster_parameter_dict.keys() | join(' ') }}
{% for key, value in cluster_parameter_dict.items() -%}
{% for key, value in slapparameter_dict.get('cluster', {}).iteritems() -%}
config-{{ key }} = {{ dumps(value) }}
{% endfor -%}
config-virtual-hard-drive-url = ${slap-parameter:virtual-hard-drive-url}
config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
config-resiliency-backup-periodicity = */5 * * * *
# XXX What to do?
sla = computer_guid
sla-computer_guid = ${slap-connection:computer-id}
[slap-parameter]
...
...
software/kvm/instance-kvm.cfg.jinja2
View file @
9d768e8f
...
...
@@ -196,11 +196,9 @@ partition-id = ${slap-connection:partition-id}
name = VNC Frontend
software-type = ${slap-parameter:frontend-software-type}
slave = true
config = host port
config-host = ${novnc-instance:ip}
config-port = ${novnc-instance:port}
return = url resource port domainname
sla = instance_guid
sla-instance_guid = ${slap-parameter:frontend-instance-guid}
[frontend-promise]
...
...
software/monitor/instance.cfg
View file @
9d768e8f
...
...
@@ -71,7 +71,6 @@ name = Monitor Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url domain
config-url = $${monitor-parameters:url}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
...
...
software/monitor/software.cfg
View file @
9d768e8f
...
...
@@ -15,7 +15,7 @@ parts =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/instance.cfg
md5sum =
6ad84a0061df0c00a9f41d8b302adc45
md5sum =
b86685e4007296f4808c2f1f1b74a290
mode = 0644
# stupify index for now
...
...
software/neoppod/cluster.cfg.in
View file @
9d768e8f
...
...
@@ -9,7 +9,6 @@
[request-common]
recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url}
sla = computer_guid
sla-computer_guid = ${slap-connection:computer-id}
server-url = ${slap-connection:server-url}
key-file = ${slap-connection:key-file}
...
...
@@ -17,22 +16,15 @@ cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id}
config-cluster = {{ slapparameter_dict['cluster'] }}
config-partitions = {{ slapparameter_dict.get('partitions', 12) }}
config-replicas = {{ slapparameter_dict.get('replicas', 0) }}
[request-config]
base = cluster
master = partitions replicas
node = masters
[node-base]
< = request-common
config = ${request-config:base} ${request-config:node}
config-masters = ${all-masters:addresses}
[mysql-storage-base]
< = request-common
config = ${request-config:base} ${request-config:master}
config-partitions = {{ slapparameter_dict.get('partitions', 12) }}
config-replicas = {{ slapparameter_dict.get('replicas', 0) }}
software-type = {{ mysql_storage_software_type }}
[mysql-storage-request-base]
...
...
@@ -61,7 +53,6 @@ name = {{ section_id }}
< = mysql-storage-base
node-base
name = {{ section_id }}
config = ${request-config:base} ${request-config:master} ${request-config:node}
{% endfor -%}
{% for node_number in range(slapparameter_dict.get('admin-count', 1)) -%}
...
...
software/neoppod/software.cfg
View file @
9d768e8f
...
...
@@ -65,7 +65,7 @@ md5sum = 987f69333c563898cab21455509f8024
[template-cluster]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/cluster.cfg.in
md5sum =
7177d129e171b20044bf435ed549af43
md5sum =
edd46f8670421520ef20c786cd65d8c1
[template-instance]
< = base-template
...
...
software/powerdns/instance-powerdns-replicate.cfg.jinja2
View file @
9d768e8f
...
...
@@ -64,12 +64,9 @@ state = {{ slapparameter_dict.pop(state_key) }}
{% endif%}
config-zone = {{ zone }}
config-soa = {{ "%s,%s" % (dns_domain, server_admin) }}
{% if sla_parameters %}
sla = {{ ' '.join(sla_parameters) }}
{% for parameter in sla_parameters -%}
{% for parameter in sla_parameters -%}
sla-{{ parameter }} = {{ slapparameter_dict.pop( sla_key + parameter ) }}
{% endfor -%}
{% endif -%}
{% endfor -%}
{% endfor -%}
...
...
@@ -86,7 +83,6 @@ software-url = ${slap-connection:software-release-url}
{% endif %}
software-type = {{dns_type}}
return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url
config = {{ ' '.join(slapparameter_dict.keys()) + ' zone soa server-admin ns-record ' + slave_list_name }}
config-server-admin = {{ server_admin }}
config-ns-record = {{ ns_record }}
{% for parameter, value in slapparameter_dict.iteritems() -%}
...
...
software/powerdns/software.cfg
View file @
9d768e8f
...
...
@@ -38,7 +38,7 @@ mode = 640
[template-dns-replicate]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2
md5sum =
7cfc55bfb9821aad44272153f60450e
f
md5sum =
83cedc8fa923c59ca900b4600cc1c52
f
mode = 0644
[iso-list]
...
...
software/slaprunner/common.cfg
View file @
9d768e8f
...
...
@@ -46,7 +46,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
md5sum = 8
a6688ed89f49d32312f2145b7f7d15e
md5sum = 8
ebc0e59db33f0105968a813a3130236
mode = 0644
[template-runner-import-script]
...
...
@@ -90,7 +90,7 @@ mode = 0644
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
download-only = true
md5sum =
01545742e97b4b95cd5e14d5d7cb1584
md5sum =
105c7c427def7b2643b7480b2bada3a5
filename = instance-resilient-test.cfg.jinja2
mode = 0644
...
...
software/slaprunner/instance-resilient-test.cfg.jinja2
View file @
9d768e8f
...
...
@@ -41,9 +41,7 @@ recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url}
software-type = resilient
name = Resilient Instance (Root Instance)
{% set cluster_parameter_dict = slapparameter_dict.get('cluster', {}) -%}
config = resiliency-backup-periodicity resilient-clone-number {{ cluster_parameter_dict.keys() | join(' ') }}
{% for key, value in cluster_parameter_dict.items() -%}
{% for key, value in slapparameter_dict.get('cluster', {}).iteritems() -%}
config-{{ key }} = {{ dumps(value) }}
{% endfor -%}
config-resiliency-backup-periodicity = */6 * * * *
...
...
@@ -51,7 +49,6 @@ config-resilient-clone-number = 2
# XXX hardcoded
#config-frontend-domain = google.com
# XXX Hack to deploy Root Instance on the same computer as the type-test Instance
sla = computer_guid
sla-computer_guid = ${slap-connection:computer-id}
return = backend_url
...
...
software/slaprunner/instance-runner.cfg
View file @
9d768e8f
...
...
@@ -78,16 +78,12 @@ computer-id = $${slap-connection:computer-id}
partition-id = $${slap-connection:partition-id}
{%- if slapparameter_dict.get('custom-frontend-instance-guid') -%}
sla = instance_guid
sla-instance_guid = $${slap-parameter:frontend-instance-guid}
{% endif -%}
{% set custom_frontend_backend_type = slapparameter_dict.get('custom-frontend-backend-type')%}
{% if custom_frontend_backend_type %}
config = url type
{% set custom_frontend_backend_type = slapparameter_dict.get('custom-frontend-backend-type') -%}
{% if custom_frontend_backend_type -%}
config-type = {{ custom_frontend_backend_type }}
{% else %}
config = url
{% endif -%}
config-url = {{ slapparameter_dict.get('custom-frontend-backend-url') }}
return = site_url domain
...
...
@@ -422,7 +418,6 @@ name = SlapRunner Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url domain
config-url = $${slaprunner:access-url}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
...
...
@@ -434,7 +429,6 @@ name = Monitor Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url domain
config-url = https://[$${monitor-httpd-configuration:listening-ip}]:$${monitor-parameters:port}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
...
...
software/test-slave-instance-deployment/instance-default.cfg
View file @
9d768e8f
...
...
@@ -40,7 +40,6 @@ name = Test Root Instance - Slave
software-url = $${slap-connection:software-release-url}
software-type = test
slave = true
sla = instance_guid
sla-instance_guid = $${request-test-instance:instance-guid}
return = foo
...
...
software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in
View file @
9d768e8f
...
...
@@ -165,7 +165,6 @@ name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url
config-url = http://[$${instance-parameter:ipv6-random}]:5000
return = site_url
...
...
software/unstable/lamp-generic/instance-apache-php.cfg.in
View file @
9d768e8f
...
...
@@ -151,7 +151,6 @@ name = Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url custom_domain
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
config-custom_domain = $${slap-parameter:domain}
...
...
software/unstable/lamp-generic/instance-edge.cfg.in
View file @
9d768e8f
...
...
@@ -20,7 +20,6 @@ return = url backend-url
country-list = $${slap-parameter:country-list}
software-url = $${slap-connection:software-release-url}
software-type = default
config = application-location
config-application-location = $${slap-parameter:application-location}
return = backend-url
...
...
software/unstable/lamp-generic/software.cfg
View file @
9d768e8f
...
...
@@ -13,7 +13,7 @@ md5sum = 26ac6629a83869140189a85e581e822f
[instance-apache-php]
url = ${:_profile_base_location_}/instance-apache-php.cfg.in
md5sum =
fdc849c9f49b9d2fb043bf229d24076b
md5sum =
062e77e6be6cda965cfdd0e6011df86e
[instance-edge]
recipe = slapos.recipe.template
...
...
software/unstable/mioga/instance-apacheperl.cfg
View file @
9d768e8f
...
...
@@ -75,7 +75,6 @@ name = Postgres
software-url = $${slap-connection:software-release-url}
software-type = postgres
return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id}
[postgres-urlparse]
...
...
@@ -139,7 +138,6 @@ name = Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url
config-url = $${mioga-url:direct_url}
return = site_url
...
...
software/unstable/trac-svn/instance-trac.cfg
View file @
9d768e8f
...
...
@@ -181,7 +181,6 @@ name = MariaDB
software-url = $${slap-connection:software-release-url}
software-type = mariadb
return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id}
[mariadb-urlparse]
...
...
@@ -437,7 +436,6 @@ name = Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url custom_domain
config-url = http://[$${slap-network-information:global-ipv6}]:8080
return = site_url
config-custom_domain = $${slap-parameter:domain}
...
...
software/unstable/trac-svn/software.cfg
View file @
9d768e8f
...
...
@@ -84,7 +84,7 @@ md5sum = bc6ed91a1862a10af661713aa0691848
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-trac.cfg
output = ${buildout:directory}/template-trac.cfg
md5sum =
1546a60e086b4d083d58ad4fca6dcca8
md5sum =
2dc7ebfa9b7d5117274b74bafed4cfd4
mode = 0644
[instance-mariadb]
...
...
software/unstable/zimbra-kvm/instance-kvm.cfg.in
View file @
9d768e8f
...
...
@@ -196,11 +196,9 @@ partition-id = $${slap-connection:partition-id}
name = VNC Frontend
software-type = $${slap-parameter:frontend-software-type}
slave = true
config = host port
config-host = $${novnc-instance:ip}
config-port = $${novnc-instance:port}
return = url resource port domainname
sla = instance_guid
sla-instance_guid = $${slap-parameter:frontend-instance-guid}
[request-web-frontend]
...
...
@@ -210,7 +208,6 @@ name = Web Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url custom_domain
config-url = https://[$${tunnel-ipv6-kvm-https:ipv6}]:$${tunnel-ipv6-kvm-https:ipv6-port}/
return = site_url
config-custom_domain = $${slap-parameter:domain}
...
...
@@ -223,7 +220,6 @@ name = SMTP Frontend
#software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/zimbra-kvm:/software/reverse-proxy-nginx/development.cfg
software-url = /opt/slapdev/software/reverse-proxy-nginx/development.cfg
slave = true
config = smtp-upstream-host smtp-upstream-port
config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6}
config-smtp-upstream-port = $${tunnel-ipv6-kvm-smtp:port}
return = listening-ipv4
...
...
stack/boinc/buildout.cfg
View file @
9d768e8f
...
...
@@ -34,7 +34,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-boinc.cfg
output = ${buildout:directory}/template-boinc.cfg
md5sum =
6642942dde15ab5195d8d8533690ef29
md5sum =
5eb6057311fb1f73a54b72a40ead47c2
mode = 0644
#Template for deploying MySQL Database Server
...
...
stack/boinc/instance-boinc.cfg
View file @
9d768e8f
...
...
@@ -302,7 +302,6 @@ name = Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url custom_domain
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
config-custom_domain = $${slap-parameter:domain}
...
...
stack/erp5/buildout.cfg
View file @
9d768e8f
...
...
@@ -165,7 +165,7 @@ extra-context =
[template-zope]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-zope.cfg.in
md5sum =
23baedc096a3ee046d2efe2195e19b96
md5sum =
ddf63b8dac634df63133c24f36df1050
mode = 640
[template-kumofs]
...
...
@@ -282,13 +282,13 @@ extra-context =
[template-erp5-single]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
md5sum =
34fa05c62c56a224d5114d2c0571f9ca
md5sum =
ee5ce422b52d1325f301a684ffc0eea3
mode = 640
[template-erp5-cluster]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
md5sum =
fe6c0d579e68b974f7350e7627546c3
4
md5sum =
1fafb23019043c069bf6e43d61010a5
4
mode = 640
[template-varnish]
...
...
stack/erp5/instance-erp5-cluster.cfg.in
View file @
9d768e8f
...
...
@@ -18,7 +18,6 @@ versions = versions
[request-common]
recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url}
sla = computer_guid
return = url
server-url = ${slap-connection:server-url}
key-file = ${slap-connection:key-file}
...
...
@@ -35,7 +34,6 @@ sla-computer_guid = ${slap-parameter:mariadb-computer-guid}
[request-cloudooo]
<=request-common
name = Cloudooo
config = cloudooo-json
config-cloudooo-json = ${slap-parameter:cloudooo-json}
software-type = cloudooo
sla-computer_guid = ${slap-parameter:cloudooo-computer-guid}
...
...
@@ -56,15 +54,6 @@ sla-computer_guid = ${slap-parameter:kumofs-computer-guid}
<=request-common
name = TidStorage
return = url-login
config =
json
mysql-url
memcached-url
cloudooo-url
kumofs-url
smtp-url
bt5
bt5-repository-url
config-json = ${slap-parameter:json}
config-mysql-url = ${request-mariadb:connection-url}
config-memcached-url = ${request-memcached:connection-url}
...
...
@@ -79,7 +68,6 @@ sla-computer_guid = ${slap-parameter:tidstorage-computer-guid}
[request-varnish]
<=request-common
name = Varnish
config = tidstorage-url
config-tidstorage-url = ${request-tidstorage:connection-url-login}
config-web-checker-mail-address = ${slap-parameter:web-checker-mail-address}
config-web-checker-smtp-host = ${slap-parameter:web-checker-smtp-host}
...
...
stack/erp5/instance-erp5-single.cfg.in
View file @
9d768e8f
...
...
@@ -91,7 +91,6 @@ bt5-repository-url = ${slap-parameter:bt5-repository-url}
[request-common]
recipe = slapos.cookbook:request
software-url = ${slap-connection:software-release-url}
sla = computer_guid
sla-computer_guid = ${slap-connection:computer-id}
return = url
server-url = ${slap-connection:server-url}
...
...
@@ -108,7 +107,6 @@ software-type = mariadb
[request-cloudooo]
<=request-common
name = Cloudooo
config = cloudooo-json
config-cloudooo-json = ${slap-parameter:cloudooo-json}
software-type = cloudooo
...
...
stack/erp5/instance-zope.cfg.in
View file @
9d768e8f
...
...
@@ -25,7 +25,6 @@ versions = versions
recipe = slapos.cookbook:request
software-url = {{ slapparameter_dict['frontend-software-url'] }}
software-type = {{ slapparameter_dict.get('frontend-software-type', 'RootSoftwareInstance') }}
sla = instance_guid
sla-instance_guid = {{ slapparameter_dict['frontend-instance-guid'] }}
server-url = ${slap-connection:server-url}
key-file = ${slap-connection:key-file}
...
...
@@ -41,7 +40,6 @@ slave = true
{% if 'frontend-domain' in slapparameter_dict -%}
{% do config_dict.__setitem__('custom_domain', slapparameter_dict['frontend-domain']) -%}
{% endif -%}
config = {{ config_dict.keys() | join(' ') }}
{% for name, value in config_dict.items() -%}
config-{{ name }} = {{ value }}
{% endfor -%}
...
...
stack/lamp/apache/instance-apache-php.cfg.in
View file @
9d768e8f
...
...
@@ -179,7 +179,6 @@ name = MariaDB
software-url = $${slap-connection:software-release-url}
software-type = mariadb
return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id}
[mariadb-urlparse]
...
...
@@ -250,7 +249,6 @@ name = Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url custom_domain
config-url = http://[$${apache-network-configuration:listening-ip}]:$${apache-network-configuration:listening-port}/
return = site_url
config-custom_domain = $${slap-parameter:domain}
...
...
stack/lamp/buildout.cfg
View file @
9d768e8f
...
...
@@ -74,7 +74,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
md5sum =
3e2d71d3684aac3e52d2f55794df96bf
md5sum =
b2564a719fdde097f402ef80e0991903
mode = 0644
[instance-apache-import]
...
...
@@ -112,7 +112,7 @@ context = key buildout buildout:bin-directory
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum =
1640ebe7f8ced607ce1ec93c4f6e5413
md5sum =
5e2f917b032e43af6a736532966ae1f0
mode = 0644
[instance-mariadb]
...
...
stack/lamp/instance-resilient.cfg.jinja2
View file @
9d768e8f
...
...
@@ -19,7 +19,6 @@ parts +=
[request-apache]
return = url ssh-public-key ssh-url notification-id ip url backend_url
# XXX: hardcoded values
config = domain number authorized-key notify namebase mariadb1-computer-guid pbs-mariadb1-computer-guid mariadb2-computer-guid pbs-mariadb2-computer-guid mariadb3-computer-guid pbs-mariadb3-computer-guid
config-mariadb1-computer-guid = ${slap-parameter:mariadb1-computer-guid}
config-pbs-mariadb1-computer-guid = ${slap-parameter:pbs-mariadb1-computer-guid}
config-mariadb2-computer-guid = ${slap-parameter:mariadb2-computer-guid}
...
...
stack/lapp/apache/instance-apache-php.cfg.in
View file @
9d768e8f
...
...
@@ -179,7 +179,6 @@ name = Postgres
software-url = $${slap-connection:software-release-url}
software-type = postgres
return = url
sla = computer_guid
sla-computer_guid = $${slap-connection:computer-id}
[postgres-urlparse]
...
...
@@ -235,7 +234,6 @@ name = Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url custom_domain
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url
config-custom_domain = $${slap-parameter:domain}
...
...
stack/lapp/buildout.cfg
View file @
9d768e8f
...
...
@@ -62,7 +62,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
output = ${buildout:directory}/instance-apache-php.cfg
md5sum =
823257dda6f3068a38c6b69c771cf307
md5sum =
7a0670c747f2f21a79c240bfbfbf9f6e
mode = 0644
[instance-apache-import]
...
...
@@ -100,7 +100,7 @@ context = key buildout buildout:bin-directory
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum =
26da0631906c2267b82703c4d4f4a911
md5sum =
35bbf8cb40fe7185664641d82b406334
mode = 0644
[instance-postgres]
...
...
stack/lapp/instance-resilient.cfg.jinja2
View file @
9d768e8f
...
...
@@ -19,7 +19,6 @@ parts +=
[request-apache]
return = url ssh-public-key ssh-url notification-id ip url backend_url
# XXX: hardcoded values
config = domain number authorized-key notify namebase postgres1-computer-guid pbs-postgres1-computer-guid postgres2-computer-guid pbs-postgres2-computer-guid postgres3-computer-guid pbs-postgres3-computer-guid maarch-sql-data-file
config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid}
config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid}
config-postgres2-computer-guid = ${slap-parameter:postgres2-computer-guid}
...
...
stack/resilient/buildout.cfg
View file @
9d768e8f
...
...
@@ -69,7 +69,7 @@ mode = 0644
[template-replicated]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/template-replicated.cfg.in
md5sum =
649b4d898ecbcdca5135ad356788c7d3
md5sum =
a21d751078dbf1fc80ecb93a6f499287
mode = 0644
destination = ${buildout:directory}/template-replicated.cfg.in
...
...
@@ -126,6 +126,6 @@ Jinja2 = 2.6
# ... And newer s.r.template requires Jinja2 >= 2.7
slapos.recipe.template = 2.4.2
rdiff-backup = 1.3.4nxd2
slapos.cookbook = 0.9
0
slapos.cookbook = 0.9
1
stack/resilient/template-replicated.cfg.in
View file @
9d768e8f
...
...
@@ -31,13 +31,6 @@ software-url = ${slap-connection:software-release-url}
software-type = {{typeexport}}
name = {{namebase}}0
return = ssh-public-key ssh-url notification-id ip
config =
# Resilient related parameters
number authorized-key notify namebase
{% if slapparameter_dict is defined %}
# Software Instance related parameters
{% for parameter_name in slapparameter_dict.keys() %}{{parameter_name}} {% endfor %}
{% endif %}
config-number = 0
config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}{% endfor %}
config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-notification-url}{% endfor %}
...
...
@@ -47,7 +40,6 @@ config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}
{% endfor %}
{% endif %}
{% if sla_parameter_dict == {} -%}
sla = mode
sla-mode = unique_by_network
{% else %}
{% set sla_key_main = "-sla-%s%s-" % (namebase, 0) -%}
...
...
@@ -62,12 +54,9 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%}
{% endfor -%}
{% if sla_dict %}
sla = {{ ' '.join(sla_dict.keys()) }}
{% for key, value in sla_dict.iteritems() -%}
{% for key, value in sla_dict.iteritems() -%}
sla-{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}
{% endfor -%}
{% endif -%}
{% for id in range(1,nbbackup|int) %}
...
...
@@ -85,12 +74,10 @@ return = ssh-public-key ssh-url notification-url ip
pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}-push
config = number authorized-key on-notification namebase
config-number = {{id}}
config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id}
{% if sla_parameter_dict == {} -%}
sla = mode
sla-mode = unique_by_network
{% else %}
{% set sla_key_main = "-sla-%s%s-" % (namebase, id) -%}
...
...
@@ -105,12 +92,9 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%}
{% endfor -%}
{% if sla_dict %}
sla = {{ ' '.join(sla_dict.keys()) }}
{% for key, value in sla_dict.iteritems() -%}
{% for key, value in sla_dict.iteritems() -%}
sla-{{ key }} = {{ value }}
{% endfor -%}
{% endif %}
{% endfor -%}
{% endif %}
[publish-connection-informations]
...
...
@@ -173,7 +157,6 @@ name = PBS ({{namebase}} / {{id}})
return = ssh-key notification-url feeds-url
slave = false
{% if sla_parameter_dict == {} -%}
sla = mode
sla-mode = unique_by_network
{% else %}
{% set sla_key_main = "-sla-%s%s-" % ("pbs", id) -%}
...
...
@@ -188,12 +171,9 @@ sla-mode = unique_by_network
{% do sla_dict.__setitem__(key[sla_key_secondary_length:], sla_parameter_dict.get(key)) -%}
{% endif -%}
{% endfor -%}
{% if sla_dict %}
sla = {{ ' '.join(sla_dict.keys()) }}
{% for key, value in sla_dict.iteritems() -%}
{% for key, value in sla_dict.iteritems() -%}
sla-{{ key }} = {{ value }}
{% endfor %}
{% endif %}
{% endfor %}
{% endif %}
[resilient-request-pbs-{{namebase}}-{{id}}-public-key-promise]
...
...
@@ -213,7 +193,6 @@ mode = 700
[request-pull-backup-server-{{namebase}}-{{id}}]
<= request-pbs-common
name = PBS {{id}} pulling from ${request-{{namebase}}:name}
config = url name type server-key on-notification notify notification-id title remove-backup-older-than
config-url = ${request-{{namebase}}:connection-ssh-url}
config-type = pull
config-server-key = ${request-{{namebase}}:connection-ssh-public-key}
...
...
@@ -224,7 +203,6 @@ config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{n
config-title = Pulling from {{namebase}}
config-remove-backup-older-than = {{ slapparameter_dict.get('remove-backup-older-than', '2W') }}
slave = true
sla = instance_guid
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
[publish-connection-informations]
...
...
@@ -234,7 +212,6 @@ feed-url-{{namebase}}-{{id}}-pull = ${request-pbs-{{namebase}}-{{id}}:connection
[request-pull-backup-server-{{namebase}}-backup-{{id}}]
<= request-pbs-common
name = PBS pushing on ${request-{{namebase}}-pseudo-replicating-{{id}}:name}
config = url name type server-key on-notification notify notification-id title
config-url = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-url}
config-type = push
config-server-key = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-public-key}
...
...
@@ -244,7 +221,6 @@ config-notification-id = ${request-{{namebase}}-pseudo-replicating-{{id}}:pbs-no
config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}
config-title = Pushing to {{namebase}} backup {{id}}
slave = true
sla = instance_guid
sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
{% endfor %}
...
...
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