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
Xiaohe Cao
slapos
Commits
76375f31
Commit
76375f31
authored
Sep 09, 2014
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5-cluster: Fix mariadb url for automated ERP5 site creation.
parent
4160aa3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-create-erp5-site-real.cfg.in
stack/erp5/instance-create-erp5-site-real.cfg.in
+1
-1
No files found.
stack/erp5/buildout.cfg
View file @
76375f31
...
@@ -230,7 +230,7 @@ md5sum = 2ce65ad372433ae8e11e30f3191bca68
...
@@ -230,7 +230,7 @@ md5sum = 2ce65ad372433ae8e11e30f3191bca68
[template-create-erp5-site-real]
[template-create-erp5-site-real]
< = download-base
< = download-base
filename = instance-create-erp5-site-real.cfg.in
filename = instance-create-erp5-site-real.cfg.in
md5sum = e
106cdd73c0a86a9b2c806062573ca8
f
md5sum = e
40e2e39f4941c6372f4357e8589a5c
f
[template]
[template]
< = template-jinja2-base
< = template-jinja2-base
...
...
stack/erp5/instance-create-erp5-site-real.cfg.in
View file @
76375f31
...
@@ -14,7 +14,7 @@ runner-path = ${directory:services}/erp5-bootstrap
...
@@ -14,7 +14,7 @@ runner-path = ${directory:services}/erp5-bootstrap
{% endfor -%}
{% endfor -%}
{# XXX: Expect the first database to be the one to use for catalog. -#}
{# XXX: Expect the first database to be the one to use for catalog. -#}
{% set mysql_parsed = urlparse.urlparse(publish['mariadb-database-list'][0]) -%}
{% set mysql_parsed = urlparse.urlparse(publish['mariadb-database-list'][0]) -%}
mysql-url = {{
urlparse.urlunparse(mysql_parsed[:1] + (reverse_hosts.get(mysql_parsed.hostname, mysql_parsed.hostname) ~ ':' ~ mysql_parsed.port, ) + mysql_parsed[2:]
) }}
mysql-url = {{
dumps(urlparse.urlunparse(mysql_parsed[:1] + (mysql_parsed.username + ":" + mysql_parsed.password + "@" + reverse_hosts.get(mysql_parsed.hostname, mysql_parsed.hostname) + ':' ~ mysql_parsed.port, ) + mysql_parsed[2:])
) }}
{# Pick the first http[s] family found, they should be all equivalent anyway. -#}
{# Pick the first http[s] family found, they should be all equivalent anyway. -#}
{% set family_list = [] -%}
{% set family_list = [] -%}
{% for key, value in publish.items() -%}
{% for key, value in publish.items() -%}
...
...
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