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
Alain Takoudjou
slapos
Commits
63f1a49f
Commit
63f1a49f
authored
Oct 26, 2020
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Plain Diff
software/repman: tests python3 compliance
See merge request
!846
parents
811feac3
ceb063a4
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
6 deletions
+10
-6
software/repman/buildout.hash.cfg
software/repman/buildout.hash.cfg
+3
-3
software/repman/instance-mariadb.cfg.jinja2.in
software/repman/instance-mariadb.cfg.jinja2.in
+1
-1
software/repman/instance-repman.cfg.jinja2.in
software/repman/instance-repman.cfg.jinja2.in
+1
-1
software/repman/instance.cfg.in
software/repman/instance.cfg.in
+1
-0
software/repman/software.cfg
software/repman/software.cfg
+3
-0
software/slapos-sr-testing/software-py3.cfg
software/slapos-sr-testing/software-py3.cfg
+1
-0
software/slapos-sr-testing/software.cfg
software/slapos-sr-testing/software.cfg
+0
-1
No files found.
software/repman/buildout.hash.cfg
View file @
63f1a49f
...
...
@@ -14,11 +14,11 @@
# not need these here).
[instance.cfg]
filename = instance.cfg.in
md5sum =
027cdcfe251b7bba9b779fee890a9162
md5sum =
fd0df2c4a91c1e478b72cbaeb6c021c3
[instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in
md5sum =
657ecdb1dfbbcf53e4e7932b3b5708c4
md5sum =
1d6eba3984b3e2009682f6ce49b8ac4d
[config-toml.in]
_update_hash_filename_ = templates/config.toml.in
...
...
@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30
[template-mariadb.cfg]
_update_hash_filename_ = instance-mariadb.cfg.jinja2.in
md5sum =
189ccee60d0fb53e29431a45e0816bc1
md5sum =
21a29a41768b2370d671d3086b3ef2bb
[template-my-cnf]
_update_hash_filename_ = templates/my.cnf.in
...
...
software/repman/instance-mariadb.cfg.jinja2.in
View file @
63f1a49f
...
...
@@ -156,7 +156,7 @@ wrapper = ${directory:controller}/mariadb
{% do part_list.append("supervisord-mariadb") %}
[odbc-ini-text]
text = {{ dumps(
slapparameter_dict.get('odbc-ini', '').encode('base64'
)) }}
text = {{ dumps(
base64.b64encode( slapparameter_dict.get('odbc-ini', '').encode()
)) }}
[{{ section('odbc-ini') }}]
< = jinja2-template-base
...
...
software/repman/instance-repman.cfg.jinja2.in
View file @
63f1a49f
...
...
@@ -359,7 +359,7 @@ update-command = ${:command}
[replication-manager-reload]
recipe = slapos.recipe.template:jinja2
template = {{ template_repman_manager_sh }}
cluster-list = {{ dumps(
slapparameter_dict.get('repman-cluster-dict', default_parameter_dict).keys(
) ) }}
cluster-list = {{ dumps(
list(slapparameter_dict.get('repman-cluster-dict', default_parameter_dict)
) ) }}
context =
section parameter_dict repman
key username repman-parameter:username
...
...
software/repman/instance.cfg.in
View file @
63f1a49f
...
...
@@ -101,3 +101,4 @@ template = {{ template_mariadb }}
filename = instance-mariadb.cfg
extra-context =
section parameter_dict template-mariadb-parameters
import base64 base64
software/repman/software.cfg
View file @
63f1a49f
...
...
@@ -28,6 +28,9 @@ parts =
template-mariadb.cfg
template-mysqld-wrapper
gowork
[python]
part = python3
[instance.cfg]
recipe = slapos.recipe.template:jinja2
...
...
software/slapos-sr-testing/software-py3.cfg
View file @
63f1a49f
...
...
@@ -15,3 +15,4 @@ extra =
${slapos.test.monitor-setup:setup}
${slapos.test.powerdns-setup:setup}
${slapos.test.proftpd-setup:setup}
${slapos.test.repman-setup:setup}
software/slapos-sr-testing/software.cfg
View file @
63f1a49f
...
...
@@ -269,7 +269,6 @@ extra =
${slapos.test.gitlab-setup:setup}
${slapos.test.cloudooo-setup:setup}
${slapos.test.dream-setup:setup}
${slapos.test.repman-setup:setup}
[versions]
# slapos.core is used from the clone always
...
...
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