Commit 61bbc356 authored by Alain Takoudjou's avatar Alain Takoudjou

repman: update since changes on supervisord controller

parent c706346c
...@@ -18,7 +18,7 @@ md5sum = b41f521b5f7980c64260ed0e5c494450 ...@@ -18,7 +18,7 @@ md5sum = b41f521b5f7980c64260ed0e5c494450
[instance-repman.cfg] [instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in _update_hash_filename_ = instance-repman.cfg.jinja2.in
md5sum = 4ddb88852c1bb89d64ecca2f2a7ada0a md5sum = 7f486e429f8c2e95d28d79748a0122d1
[config-toml.in] [config-toml.in]
_update_hash_filename_ = templates/config.toml.in _update_hash_filename_ = templates/config.toml.in
...@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30 ...@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30
[template-mariadb.cfg] [template-mariadb.cfg]
_update_hash_filename_ = instance-mariadb.cfg.jinja2.in _update_hash_filename_ = instance-mariadb.cfg.jinja2.in
md5sum = 44c4b22c37adc6b7add3581aee7bbadf md5sum = b750f9ea573128a77ee6292048392844
[template-my-cnf] [template-my-cnf]
_update_hash_filename_ = templates/my.cnf.in _update_hash_filename_ = templates/my.cnf.in
......
...@@ -144,13 +144,13 @@ executable = ${mysqld:rendered} ...@@ -144,13 +144,13 @@ executable = ${mysqld:rendered}
wrapper = ${directory:controller}/mariadb wrapper = ${directory:controller}/mariadb
{% import "supervisord_lib" as supervisord_lib with context %} {% import "supervisord_lib" as supervisord_lib with context %}
{{ supervisord_lib.supervisord("mariadb-controller", buildout_bin_directory, supervisord_conf, use_service_hash=False) }} {{ supervisord_lib.supervisord("mariadb-ctl", buildout_bin_directory, supervisord_conf, use_service_hash=False) }}
{% do part_list.append("mariadb-controller-service") -%} {% do part_list.append("supervisord-mariadb-ctl") -%}
{% set maradb_program_dict = {"name": "mariadb", "command": "${ca-mysqld:wrapper}", {% set maradb_program_dict = {"name": "mariadb", "command": "${ca-mysqld:wrapper}",
"stopwaitsecs": 86400, "environment": []} %} "stopwaitsecs": 86400, "environment": []} %}
{{ supervisord_lib.supervisord_program("mariadb-controller", "mariadb", maradb_program_dict) }} {{ supervisord_lib.supervisord_program("mariadb", maradb_program_dict) }}
{% do part_list.append("mariadb-controller-mariadb") %} {% do part_list.append("supervisord-mariadb") %}
[odbc-ini-text] [odbc-ini-text]
text = {{ dumps(slapparameter_dict.get('odbc-ini', '').encode('base64')) }} text = {{ dumps(slapparameter_dict.get('odbc-ini', '').encode('base64')) }}
...@@ -286,7 +286,7 @@ command = ${template-mysqld-need-start:rendered} ...@@ -286,7 +286,7 @@ command = ${template-mysqld-need-start:rendered}
rendered = ${directory:bin}/mysqld_need_start rendered = ${directory:bin}/mysqld_need_start
template = {{ parameter_dict['template-mysqld-need-start'] }} template = {{ parameter_dict['template-mysqld-need-start'] }}
context = context =
key mariadb_controller mariadb-controller-bin:wrapper-path key mariadb_controller mariadb-ctl-bin:wrapper-path
key update_config mysql-get-config:rendered key update_config mysql-get-config:rendered
raw username {{ slapparameter_dict['repman-user'] }} raw username {{ slapparameter_dict['repman-user'] }}
raw repman_url {{ slapparameter_dict['repman-url'] }} raw repman_url {{ slapparameter_dict['repman-url'] }}
......
...@@ -27,9 +27,9 @@ nginx-prefix = ${:var}/nginx ...@@ -27,9 +27,9 @@ nginx-prefix = ${:var}/nginx
tmp = ${:home}/tmp tmp = ${:home}/tmp
{% import "supervisord_lib" as supervisord_lib with context %} {% import "supervisord_lib" as supervisord_lib with context %}
{% set proxysql_controller = "proxysql-controller" -%} {% set proxysql_controller = "proxysql-ctl" -%}
{{ supervisord_lib.supervisord(proxysql_controller, buildout_bin_directory, supervisord_conf, use_service_hash=False) }} {{ supervisord_lib.supervisord(proxysql_controller, buildout_bin_directory, supervisord_conf, use_service_hash=False) }}
{% do part_list.append("proxysql-controller-service") -%} {% do part_list.append("supervisord-proxysql-ctl") -%}
[request-common] [request-common]
recipe = slapos.cookbook:request.serialised recipe = slapos.cookbook:request.serialised
...@@ -226,8 +226,8 @@ config-port = {{ '${' ~ name ~ '-cluster-parameter:proxy-port}' }} ...@@ -226,8 +226,8 @@ config-port = {{ '${' ~ name ~ '-cluster-parameter:proxy-port}' }}
"stdout_logfile": "${repman:proxies-log}/" ~ service_name ~ ".log", "stdout_logfile": "${repman:proxies-log}/" ~ service_name ~ ".log",
"stderr_logfile": "${repman:proxies-log}/" ~ service_name ~ ".log" } %} "stderr_logfile": "${repman:proxies-log}/" ~ service_name ~ ".log" } %}
{{ supervisord_lib.supervisord_program(proxysql_controller, service_name, proxysql_dict) }} {{ supervisord_lib.supervisord_program(service_name, proxysql_dict) }}
{% do part_list.append(proxysql_controller ~ "-" ~ service_name) %} {% do part_list.append("supervisord-" ~ service_name) %}
{% do part_list.append('config-' ~ name) -%} {% do part_list.append('config-' ~ name) -%}
{% do cluster_list.append("{'name': '" ~ name ~ "', 'host': '" ~ ipv4 ~ "', 'port': '${" ~ name ~ "-cluster-parameter:proxy-admin-port}'}") -%} {% do cluster_list.append("{'name': '" ~ name ~ "', 'host': '" ~ ipv4 ~ "', 'port': '${" ~ name ~ "-cluster-parameter:proxy-admin-port}'}") -%}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment