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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
slapos
Commits
b0a6f9e6
Commit
b0a6f9e6
authored
11 years ago
by
Nicolas Wavrant
Committed by
Cédric Le Ninivin
10 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: slapos-cfg template section lightened
parent
e29c51e5
master
8-9-nxd
downgrade-git-2.10.2
gitlab
gitlab-8.8.7
gitlab-8.8.9
monitor-stack
nayuos
new-frontend
openblas-make-ext-options
palo
postgres
reafs/heads/ipython
sitemon
slapos-master-cluster
slaprunner
slaprunner-paas
systematic
systematic-nginx
tristan-erp5-cluster
tristan-tmp
trusted-proxies
watcher-signals
webrunner.custom-personal
1.0.19
1.0.18
1.0.17
1.0.16
1.0.15
1.0.14
1.0.13
1.0.12
1.0.11
1.0.10
1.0.9
1.0.8.1
1.0.8
1.0.7
1.0.6
1.0.5
1.0.4
1.0.3
1.0.2
1.0.1
vifib-20150331
vifib-20150203
vifib-20150130
vifib-20150123
vifib-20150116
vifib-20141222
slapos.cookbook-0.102
slapos.cookbook-0.101
slapos.cookbook-0.100
slapos.cookbook-0.99
slapos.cookbook-0.98
slapos.cookbook-0.97
slapos.cookbook-0.96
slapos.cookbook-0.95
slapos.cookbook-0.94
slapos.cookbook-0.93
slapos.cookbook-0.92
slapos.cookbook-0.91
slapos.cookbook-0.90
slapos.cookbook-0.89
slapos.cookbook-0.88
slapos.cookbook-0.87
slapos.cookbook-0.86
slapos-0.271
slapos-0.270
slapos-0.269
slapos-0.268
slapos-0.267
slapos-0.266
slapos-0.265
slapos-0.264
slapos-0.263
slapos-0.262
slapos-0.261
slapos-0.260
slapos-0.259.2
slapos-0.259.1
slapos-0.259
slapos-0.258
slapos-0.257
slapos-0.256
slapos-0.255
slapos-0.254
slapos-0.253.3
slapos-0.253.2
slapos-0.253.1
slapos-0.253
slapos-0.252.1
slapos-0.252
slapos-0.251
slapos-0.250.2
slapos-0.250.1
slapos-0.250
slapos-0.249.1
slapos-0.249
slapos-0.248.1
slapos-0.248
slapos-0.247
slapos-0.246
slapos-0.245
slapos-0.244
slapos-0.243
slapos-0.242
slapos-0.241
slapos-0.240.0
slapos-0.240
slapos-0.239
slapos-0.238
slapos-0.237
slapos-0.236
slapos-0.235
slapos-0.234
slapos-0.233
slapos-0.232
slapos-0.231
slapos-0.230
slapos-0.229
slapos-0.228
slapos-0.227
slapos-0.226
slapos-0.225
slapos-0.224
slapos-0.223.1
slapos-0.223
slapos-0.222
slapos-0.221
slapos-0.220
slapos-0.219
slapos-0.218.2
slapos-0.218.1
slapos-0.218
slapos-0.217
erp5-cluster-0.1.1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
71 deletions
+43
-71
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-5
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+10
-34
software/slaprunner/template/slapos.cfg.in
software/slaprunner/template/slapos.cfg.in
+32
-32
No files found.
software/slaprunner/common.cfg
View file @
b0a6f9e6
...
...
@@ -103,11 +103,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[slapos-cfg-template]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
<<<<<<< HEAD
md5sum = d31d1c51a51bc4b2b8dda197777a4bcb
=======
md5sum = 65dc3a88476b8e0366dbd40493ad4bc9
>>>>>>> 3f080e7... slaprunner: knowledge0 file path is transmitted to slaprunner throught slapos.cfg file
md5sum = e1608c965da48ab6b14b9ad88e8e5298
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in
download-only = true
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/instance-runner.cfg
View file @
b0a6f9e6
...
...
@@ -145,8 +145,8 @@ git-binary = ${git:location}/bin/git
slapos.cfg = $${directory:etc}/slapos.cfg
working-directory = $${runnerdirectory:home}
project-directory = $${runnerdirectory:project}
software-directory = $${runnerdirectory:softwar
e-root}
instance-directory = $${runnerdirectory:instanc
e-root}
instance_root = $${runnerdirectory:instanc
e-root}
software_root = $${runnerdirectory:softwar
e-root}
#XXX-Nico hardcoded default port because overridden by this buildout config
instance-monitor-url = https://[$${:ipv6}]:9685
etc_dir = $${directory:etc}
...
...
@@ -157,17 +157,22 @@ public_key = $${sshkeys-dropbear-runner:public-key}
private_key = $${sshkeys-dropbear-runner:private-key}
ipv4 = $${slap-network-information:local-ipv4}
ipv6 = $${slap-network-information:global-ipv6}
instance_root = $${runnerdirectory:instance-root}
proxy_port = 50000
runner_port = 50005
partition-amount = $${slap-parameter:instance-amount}
wrapper = $${directory:services}/slaprunner
debug = $${slap-parameter:debug}
access-url = https://[$${:ipv6}]:$${:runner_port}
sup
d-temp-var
= $${directory:etc}/supervisord.conf
prox
-db-var
= $${slaprunner:working-directory}/proxy.db
sup
ervisord_config
= $${directory:etc}/supervisord.conf
prox
y_database
= $${slaprunner:working-directory}/proxy.db
console = False
verbose = False
debug = False
auto_deploy = $${slap-parameter:auto-deploy}
auto_deploy_instance = $${slap-parameter:auto-deploy-instance}
autorun = $${slap-parameter:autorun}
knowledge0_file = $${buildout:directory}/$${public:filename}
[test-runner]
<= slaprunner
...
...
@@ -478,36 +483,7 @@ template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
rendered = $${slaprunner:slapos.cfg}
mode = 700
context =
key auto_deploy slap-parameter:auto-deploy
key auto_deploy_instance slap-parameter:auto-deploy-instance
key autorun slap-parameter:autorun
key console slaprunner:console
key debug slaprunner:debug
key etc_dir slaprunner:etc_dir
key git slaprunner:git-binary
key instance_root runnerdirectory:instance-root
key instance_monitoring_url slaprunner:instance-monitor-url
key ipv4 slaprunner:ipv4
key ipv6 slaprunner:ipv6
raw knowledge0_file $${buildout:directory}/$${public:filename}
key log_dir slaprunner:log_dir
key partition_amount slaprunner:partition-amount
key private_key slaprunner:private_key
key proxy_database slaprunner:prox-db-var
key proxy_host slaprunner:ipv4
key proxy_port slaprunner:proxy_port
key public_key slaprunner:public_key
key run_dir slaprunner:run_dir
key runner_port slaprunner:runner_port
key runner_workdir slaprunner:working-directory
key slapgrid_cp slaprunner:slapgrid_cp
key slapgrid_sr slaprunner:slapgrid_sr
key slapproxy slaprunner:slapproxy
key software_root runnerdirectory:software-root
key ssh_client slaprunner:ssh_client
key supervisor slaprunner:supervisor
key supervisord_config slaprunner:supd-temp-var
key verbose slaprunner:verbose
section slaprunner slaprunner
[shellinabox]
recipe = slapos.cookbook:shellinabox
...
...
This diff is collapsed.
Click to expand it.
software/slaprunner/template/slapos.cfg.in
View file @
b0a6f9e6
[slapos]
software_root = {{ s
oftware_root
}}
instance_root = {{
instance_root
}}
master_url = http://{{
ipv4 }}:{{ proxy_port
}}
software_root = {{ s
laprunner['software_root']
}}
instance_root = {{
slaprunner['instance_root']
}}
master_url = http://{{
slaprunner['ipv4'] }}:{{ slaprunner['proxy_port']
}}
computer_id = slaprunner
maximal_delay = 0
[slapformat]
partition_amount = {{
partition_amount
}}
partition_amount = {{
slaprunner['partition-amount']
}}
[slaprunner]
slapgrid_sr = {{ slap
grid_sr
}}
slapgrid_cp = {{ slap
grid_cp
}}
slapproxy = {{ slap
proxy
}}
supervisor = {{ s
upervisor
}}
supervisord_config = {{ s
upervisord_config
}}
runner_workdir = {{
runner_workdir
}}
runner_host = {{
ipv4
}}
runner_port = {{
runner_port
}}
instance_monitoring_url = {{
instance_monitoring_url
}}
ipv4_address = {{
ipv4
}}
ipv6_address = {{
ipv6
}}
etc_dir = {{
etc_dir
}}
run_dir = {{
run_dir
}}
log_dir = {{
log_dir
}}
console = {{
console
}}
verbose = {{
verbose
}}
debug = {{
debug
}}
auto_deploy = {{
auto_deploy
}}
auto_deploy_instance = {{
auto_deploy_instance
}}
autorun = {{
autorun
}}
knowledge0_cfg = {{
knowledge0_file
}}
slapgrid_sr = {{ slap
runner['slapgrid_sr']
}}
slapgrid_cp = {{ slap
runner['slapgrid_cp']
}}
slapproxy = {{ slap
runner['slapproxy']
}}
supervisor = {{ s
laprunner['supervisor']
}}
supervisord_config = {{ s
laprunner['supervisord_config']
}}
runner_workdir = {{
slaprunner['working-directory']
}}
runner_host = {{
slaprunner['ipv4']
}}
runner_port = {{
slaprunner['runner_port']
}}
instance_monitoring_url = {{
slaprunner['instance-monitor-url']
}}
ipv4_address = {{
slaprunner['ipv4']
}}
ipv6_address = {{
slaprunner['ipv6']
}}
etc_dir = {{
slaprunner['etc_dir']
}}
run_dir = {{
slaprunner['run_dir']
}}
log_dir = {{
slaprunner['log_dir']
}}
console = {{
slaprunner['console']
}}
verbose = {{
slaprunner['verbose']
}}
debug = {{
slaprunner['debug']
}}
auto_deploy = {{
slaprunner['auto_deploy']
}}
auto_deploy_instance = {{
slaprunner['auto_deploy_instance']
}}
autorun = {{
slaprunner['autorun']
}}
knowledge0_cfg = {{
slaprunner['knowledge0_file']
}}
[slapproxy]
host = {{
proxy_host
}}
port = {{
proxy_port
}}
database_uri = {{
proxy_database
}}
host = {{
slaprunner['ipv4']
}}
port = {{
slaprunner['proxy_port']
}}
database_uri = {{
slaprunner['proxy_database']
}}
[sshkeys_authority]
ssh_client = {{ s
sh_client
}}
public_key = {{
public_key
}}
private_key = {{
private_key
}}
ssh_client = {{ s
laprunner['ssh_client']
}}
public_key = {{
slaprunner['public_key']
}}
private_key = {{
slaprunner['private_key']
}}
[gitclient]
git = {{
git
}}
git = {{
slaprunner['git-binary']
}}
[cloud9_IDE]
This diff is collapsed.
Click to expand it.
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