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
Cédric Le Ninivin
slapos
Commits
f19c9165
Commit
f19c9165
authored
Jul 17, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! Initial Cloudooo Cluster setup
parent
a2103257
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
18 deletions
+37
-18
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+20
-10
software/cloudooo/instance.cfg.in
software/cloudooo/instance.cfg.in
+2
-0
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+15
-8
No files found.
software/cloudooo/instance-cloudoo.cfg.in
View file @
f19c9165
{% set ipv4 = (ipv4_set | list)[0] -%}
{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
{% set section_list = [] -%}
{% macro section(name) %}{% do section_list.append(name) %}{{ name }}{% endmacro -%}
[buildout]
[buildout]
parts =
parts =
publish-cloudooo-connection-information
publish-cloudooo-connection-information
...
@@ -14,8 +17,7 @@ url = cloudooo://${haproxy:ip}:${haproxy:port}/
...
@@ -14,8 +17,7 @@ url = cloudooo://${haproxy:ip}:${haproxy:port}/
[cloudooo-base]
[cloudooo-base]
recipe = slapos.cookbook:generic.cloudooo
recipe = slapos.cookbook:generic.cloudooo
ip = ${slap-network-information:local-ipv4}
ip = {{ ipv4 }}
wrapper = ${basedirectory:services}/cloudooo
environment =
environment =
LD_LIBRARY_PATH = {{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
LD_LIBRARY_PATH = {{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
...
@@ -27,28 +29,31 @@ ooo-paster = {{ bin_directory }}/cloudooo_paster
...
@@ -27,28 +29,31 @@ ooo-paster = {{ bin_directory }}/cloudooo_paster
ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
{% set cloudooo_port = 23000 -%}
{% set cloudooo_port = 23000 -%}
{% for index in range(slapparameter_dict.get('backend_count', 1)) -%}
{% set backend_count = slapparameter_dict.get('backend-count', 1) | int -%}
{% for index in range(backend_count) -%}
{% set name = 'cloudooo-' ~ index -%}
{% set name = 'cloudooo-' ~ index -%}
[{{ section(name) }}]
[{{ section(name) }}]
< = cloudooo-base
< = cloudooo-base
port = {{ cloudooo_port }}
port = {{ cloudooo_port }}
openoffice-port = {{ cloudooo_port + 1 }}
openoffice-port = {{ cloudooo_port + 1 }}
configuration-file = ${rootdirectory:etc}/{{ name }}.cfg
configuration-file = ${rootdirectory:etc}/{{ name }}.cfg
data-directory = ${rootdirectory:srv}/{{ name }}
wrapper = ${basedirectory:services}/{{ name }}
{% set cloudooo_port = cloudooo_port + 2 -%}
{% set cloudooo_port = cloudooo_port + 2 -%}
{% endfor -%}
{% endfor -%}
[haproxy]
[haproxy]
recipe = slapos.cookbook:haproxy
recipe = slapos.cookbook:haproxy
name =
haproxy
name =
cloudooo
conf-path = ${directory:etc}/haproxy.cfg
conf-path = ${directory:etc}/haproxy.cfg
socket-path = ${directory:run}/haproxy.sock
ip = {{ ipv4 }}
ip = {{ ipv4 }}
port = 8001
port = 8001
maxconn = {{ slapparameter_dict['haproxy-maxconn'] }}
maxconn = 1
# XXX: should be optional (check recipe code)
server-check-path = {{ slapparameter_dict['haproxy-server-check-path'] }}
wrapper-path = ${directory:services}/haproxy
wrapper-path = ${directory:services}/haproxy
binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
ctl-path = ${directory:bin}/haproxy-ctl
backend-list =
backend-list =
{%- for section_name in section_list %}
{%- for section_name in section_list %}
{{ "${" ~ section_name ~ ":ip}:${" ~ section_name ~ ":port}" }}
{{ "${" ~ section_name ~ ":ip}:${" ~ section_name ~ ":port}" }}
...
@@ -65,8 +70,8 @@ prepend-path = ${buildout:bin-directory}
...
@@ -65,8 +70,8 @@ prepend-path = ${buildout:bin-directory}
run-unit-test = ${buildout:bin-directory}/runUnitTest
run-unit-test = ${buildout:bin-directory}/runUnitTest
run-test-suite = ${buildout:bin-directory}/runTestSuite
run-test-suite = ${buildout:bin-directory}/runTestSuite
ooo-paster = ${cloudooo-
instance
:ooo-paster}
ooo-paster = ${cloudooo-
0
:ooo-paster}
configuration-file = ${cloudooo-
instance
:configuration-file}
configuration-file = ${cloudooo-
0
:configuration-file}
run-unit-test-binary = {{ bin_directory }}/runCloudoooUnitTest
run-unit-test-binary = {{ bin_directory }}/runCloudoooUnitTest
run-test-suite-binary = {{ bin_directory }}/runCloudoooTestSuite
run-test-suite-binary = {{ bin_directory }}/runCloudoooTestSuite
...
@@ -104,7 +109,11 @@ services = ${rootdirectory:etc}/run
...
@@ -104,7 +109,11 @@ services = ${rootdirectory:etc}/run
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
cloudooo-data = ${rootdirectory:srv}/cloudooo
bin = ${rootdirectory:bin}
etc = ${rootdirectory:etc}
services = ${:etc}/run
var = ${rootdirectory:var}
run = ${:var}/run
font = ${rootdirectory:srv}/font
font = ${rootdirectory:srv}/font
[rootdirectory]
[rootdirectory]
...
@@ -112,3 +121,4 @@ recipe = slapos.cookbook:mkdirectory
...
@@ -112,3 +121,4 @@ recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc
etc = ${buildout:directory}/etc
srv = ${buildout:directory}/srv
srv = ${buildout:directory}/srv
bin = ${buildout:directory}/bin
bin = ${buildout:directory}/bin
var = ${buildout:directory}/var
software/cloudooo/instance.cfg.in
View file @
f19c9165
...
@@ -50,8 +50,10 @@ buildout-bin-directory = {{ buildout_bin_directory }}
...
@@ -50,8 +50,10 @@ buildout-bin-directory = {{ buildout_bin_directory }}
< = jinja2-template-base
< = jinja2-template-base
template = {{ template_cloudooo }}
template = {{ template_cloudooo }}
filename = instance-cloudoo.cfg
filename = instance-cloudoo.cfg
extensions = jinja2.ext.do
extra-context =
extra-context =
section parameter_dict dynamic-template-cloudooo-parameters
section parameter_dict dynamic-template-cloudooo-parameters
key ipv4_set slap-parameters:ipv4
[switch-softwaretype]
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
recipe = slapos.cookbook:softwaretype
...
...
software/cloudooo/software.cfg
View file @
f19c9165
...
@@ -16,6 +16,7 @@ parts +=
...
@@ -16,6 +16,7 @@ parts +=
check-recipe
check-recipe
# Create instance template
# Create instance template
template
template
slapos-cookbook
# XXX: Workaround of SlapOS limitation
# XXX: Workaround of SlapOS limitation
# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
...
@@ -24,11 +25,10 @@ unzip = true
...
@@ -24,11 +25,10 @@ unzip = true
# Local development
# Local development
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe = plone.recipe.command
recipe = slapos.recipe.build:gitclone
stop-on-error = true
repository = http://git.erp5.org/repos/slapos.git
location = ${buildout:parts-directory}/${:_buildout_section_name_}
branch = cloudooo-clusterise
command = ${git:location}/bin/git clone --branch cloudooo --quiet http://git.erp5.org/repos/slapos.git ${:location}
git-executable = ${git:location}/bin/git
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[check-recipe]
[check-recipe]
recipe = plone.recipe.command
recipe = plone.recipe.command
...
@@ -36,6 +36,14 @@ stop-on-error = true
...
@@ -36,6 +36,14 @@ stop-on-error = true
update-command = ${:command}
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[slap-parameters]
recipe = slapos.cookbook:slapconfiguration
computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id}
url = ${slap-connection:server-url}
key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
[template-jinja2-base]
[template-jinja2-base]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename}.in
template = ${:_profile_base_location_}/${:filename}.in
...
@@ -54,7 +62,7 @@ context =
...
@@ -54,7 +62,7 @@ context =
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
dd0073d8e8d8aaf94df0405c86c7a05
5
md5sum =
425cb2e76d46d53bb0b0eebdb8c1aa9
5
extra-context =
extra-context =
key buildout_bin_directory buildout:bin-directory
key buildout_bin_directory buildout:bin-directory
key dcron_location dcron:location
key dcron_location dcron:location
...
@@ -84,10 +92,9 @@ extra-context =
...
@@ -84,10 +92,9 @@ extra-context =
[template-cloudooo]
[template-cloudooo]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum =
91eb4b262d3d61d193fa13fb97ef28c8
md5sum =
6ac3dbd98958cdf3131c0e79754d4cb0
mode = 640
mode = 640
[networkcache]
[networkcache]
# signature certificates of the following uploaders.
# signature certificates of the following uploaders.
# Romain Courteaud
# Romain Courteaud
...
...
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