Commit a669c51b authored by Alain Takoudjou's avatar Alain Takoudjou

Repman Fixup

See merge request !776
parents 9bac569b 43c34306
...@@ -16,7 +16,6 @@ shared = true ...@@ -16,7 +16,6 @@ shared = true
url = https://github.com/akopytov/sysbench/archive/1.0.19.tar.gz url = https://github.com/akopytov/sysbench/archive/1.0.19.tar.gz
md5sum = 2912bfe7238cac7351459019a84e2557 md5sum = 2912bfe7238cac7351459019a84e2557
pre-configure = pre-configure =
aclocal -I${pkgconfig:location}/share/aclocal -I${libtool:location}/share/aclocal -I${gettext:location}/share/aclocal
./autogen.sh ./autogen.sh
configure-options = configure-options =
--disable-static --disable-static
......
...@@ -18,15 +18,15 @@ md5sum = b41f521b5f7980c64260ed0e5c494450 ...@@ -18,15 +18,15 @@ 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 = 7dbaace0d7db0e26d582ad17f36ac9cd md5sum = 657ecdb1dfbbcf53e4e7932b3b5708c4
[config-toml.in] [config-toml.in]
_update_hash_filename_ = templates/config.toml.in _update_hash_filename_ = templates/config.toml.in
md5sum = 5cfa75ca5a0048a050c0041dfe541f3d md5sum = 19fe38a342a5c9857e29f78eedb3c46e
[config-cluster-toml.in] [config-cluster-toml.in]
_update_hash_filename_ = templates/cluster-config.toml.in _update_hash_filename_ = templates/cluster-config.toml.in
md5sum = d2e79a9435082d9420281b4f59a5d464 md5sum = 079599a2841b5a0d5178bb12c4a30ae8
[nginx.conf.in] [nginx.conf.in]
_update_hash_filename_ = templates/nginx.conf.in _update_hash_filename_ = templates/nginx.conf.in
......
{ {
"type": "object", "type": "object",
"$schema": "http://json-schema.org/draft-04/schema", "$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters", "title": "Input Parameters",
"properties": { "properties": {
"slave-frontend": { "slave-frontend": {
"title": "Web frontend", "title": "Web frontend",
"description": "Front end used to provide web access for internal services at the kvm.", "description": "Front end used to provide web access for internal services at the kvm.",
"properties": { "properties": {
"slave-domain": { "slave-domain": {
"title": "Slave frontend domain", "title": "Slave frontend domain",
"description": "Unique domain name for this slave frontend.", "description": "Unique domain name for this slave frontend.",
"type": "string", "type": "string",
"default": "" "default": ""
}, },
"instance-guid": { "instance-guid": {
"title": "Main Frontend Instance ID", "title": "Main Frontend Instance ID",
"description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".", "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",
"type": "string", "type": "string",
"default": "" "default": ""
}, },
"frontend-software-type": { "frontend-software-type": {
"title": "Frontend Software Type", "title": "Frontend Software Type",
"description": "Type of the frontend instance, like \"frontend\".", "description": "Type of the frontend instance, like \"frontend\".",
"type": "string" "type": "string"
}, },
"frontend-software-url": { "frontend-software-url": {
"title": "Frontend Software URL", "title": "Frontend Software URL",
"description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".", "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg" "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
} }
}, },
"type": "object" "type": "object"
}, },
"computer-memory-percent-threshold": { "computer-memory-percent-threshold": {
"title": "Computer memory percent threshold.", "title": "Computer memory percent threshold.",
"description": "Computer memory percent threshold.", "description": "Computer memory percent threshold.",
"type": "int", "type": "integer",
"default": 80 "default": 80
}, },
"monitor-interface-url": { "monitor-interface-url": {
"title": "Monitor Web Interface URL", "title": "Monitor Web Interface URL",
"description": "Give Url of HTML web interface that will be used to render this monitor instance.", "description": "Give Url of HTML web interface that will be used to render this monitor instance.",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"default": "https://monitor.app.officejs.com" "default": "https://monitor.app.officejs.com"
}, },
"monitor-cors-domains": { "monitor-cors-domains": {
"title": "Monitor CORS domains", "title": "Monitor CORS domains",
"description": "List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain.", "description": "List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain.",
"type": "string", "type": "string",
"default": "monitor.app.officejs.com" "default": "monitor.app.officejs.com"
}, },
"mail-from": { "mail-from": {
"title": "Mail From", "title": "Mail From",
"description": "Mail From address", "description": "Mail From address",
"type": "string", "type": "string",
"default": "" "default": ""
}, },
"mail-smtp-addr": { "mail-smtp-addr": {
"title": "Mail SMTP address", "title": "Mail SMTP address",
"description": "Mail SMTP address. Default: localhost:25", "description": "Mail SMTP address. Default: localhost",
"type": "string", "type": "string",
"default": "localhost:25" "default": "localhost"
}, },
"mail-smtp-password": { "mail-smtp-port": {
"title": "Mail SMTP password", "title": "Mail SMTP port",
"description": "Mail SMTP password", "description": "Mail SMTP port. Default: 25",
"type": "string", "type": "integer",
"default": "" "default": "25"
}, },
"mail-smtp-user": { "mail-smtp-password": {
"title": "Mail SMTP User", "title": "Mail SMTP password",
"description": "Mail SMTP User", "description": "Mail SMTP password",
"type": "string", "type": "string",
"default": "" "default": ""
}, },
"mail-to": { "mail-smtp-user": {
"title": "Mail To", "title": "Mail SMTP User",
"description": "", "description": "Mail SMTP User",
"type": "string", "type": "string",
"default": "" "default": ""
}, },
"tags": { "mail-to": {
"title": "Provisioning db tags", "title": "Mail To",
"description": "Provisioning db tags", "description": "",
"type": "string", "type": "string",
"default": "gtidstrict,bind,pkg,innodb,noquerycache,slow,pfs,linux,readonly,diskmonitor,sqlerror,compressbinlog,bm4ci,mroonga,utctime,readcommitted,nohandshake" "default": ""
}, },
"http-session-lifetime": { "tags": {
"title": "Web Session life time in s", "title": "Provisioning db tag list",
"description": "Web interface Session life time in seconds. Default 86400", "description": "Provisioning db tags. Set one tag per line.",
"type": "integer", "type": "array",
"default": 86400 "items": {
}, "type": "string"
"http-refresh-interval": { },
"title": "Web refresh interval in s", "default": [
"description": "Web interface refresh interval in s. Default 4s.", "gtidstrict",
"type": "integer", "bind",
"default": 4 "pkg",
}, "innodb",
"autorejoin": { "noquerycache",
"title": "Automatic rejoin a failed master", "slow",
"description": "Automatic rejoin a failed master (default true)", "pfs",
"type": "boolean", "linux",
"default": true "readonly",
}, "diskmonitor",
"autoseed": { "sqlerror",
"title": "Automatic join a standalone node", "compressbinlog",
"description": "Automatic join a standalone node", "bm4ci",
"type": "boolean", "mroonga",
"default": true "utctime",
}, "readcommitted",
"repman-cluster-dict": { "nohandshake"
"title": "Replication Manager clusters definition", ]
"description": "Replication Manager clusters definition", },
"patternProperties": { "http-session-lifetime": {
".*": { "title": "Web Session life time in s",
"properties": { "description": "Web interface Session life time in seconds. Default 86400",
"name": { "type": "integer",
"title": "Name of the cluster", "default": 86400
"description": "Name of the cluster: Should not contains spaces or any special characters.", },
"type": "string", "http-refresh-interval": {
"default": "" "title": "Web refresh interval in s",
}, "description": "Web interface refresh interval in s. Default 4s.",
"database-amount": { "type": "integer",
"title": "Amount of databases for cluster", "default": 4
"description": "Database amount to deploy with this cluster. Minimal amount is 2 required to enable replication.", },
"type": "integer", "autorejoin": {
"default": 2, "title": "Automatic rejoin a failed master",
"minimum": 2 "description": "Automatic rejoin a failed master (default true)",
}, "type": "boolean",
"-sla-0-computer_guid": { "default": true
"title": "Prefered Master Computer Guid", },
"description": "Computer Guid for prefered Master database.", "autoseed": {
"type": "string", "title": "Automatic join a standalone node",
"default": "" "description": "Automatic join a standalone node",
}, "type": "boolean",
"-sla-1-computer_guid": { "default": true
"title": "Slave 1 Computer Guid", },
"description": "Computer Guid for the first slave database.", "repman-cluster-dict": {
"type": "string", "title": "Replication Manager clusters definition",
"default": "" "description": "Replication Manager clusters definition",
}, "patternProperties": {
"-sla-2-computer_guid": { ".*": {
"title": "Slave 2 Computer Guid", "properties": {
"description": "Computer Guid for the second slave database.", "name": {
"type": "string", "title": "Name of the cluster",
"default": "" "description": "Name of the cluster: Should not contains spaces or any special characters.",
}, "type": "string",
"-sla-3-computer_guid": { "default": ""
"title": "Slave 3 Computer Guid", },
"description": "Computer Guid for the third slave database.", "database-amount": {
"type": "string", "title": "Amount of databases for cluster",
"default": "" "description": "Database amount to deploy with this cluster. Minimal amount is 2 required to enable replication.",
}, "type": "integer",
"-sla-4-computer_guid": { "default": 2,
"title": "Slave 4 Computer Guid", "minimum": 2
"description": "Computer Guid for the fourth slave database.", },
"type": "string", "-sla-0-computer_guid": {
"default": "" "title": "Prefered Master Computer Guid",
}, "description": "Computer Guid for prefered Master database.",
"proxysql-user": { "type": "string",
"title": "Proxysql username", "default": ""
"description": "Proxysql external user, default is 'external'.", },
"type": "string", "-sla-1-computer_guid": {
"default": "external" "title": "Slave 1 Computer Guid",
}, "description": "Computer Guid for the first slave database.",
"proxy-tags": { "type": "string",
"title": "Proxy tags", "default": ""
"description": "playbook configuration tags. Default: pkg,masterslave,linux,noreadwritesplit", },
"type": "string", "-sla-2-computer_guid": {
"default": "pkg,masterslave,linux,noreadwritesplit" "title": "Slave 2 Computer Guid",
}, "description": "Computer Guid for the second slave database.",
"logical-backup-cron": { "type": "string",
"title": "Mysqldump backup cron definition.", "default": ""
"description": "Logical backup cron expression represents a set of times, using cron format.", },
"type": "string", "-sla-3-computer_guid": {
"default": "0 21 * * *" "title": "Slave 3 Computer Guid",
}, "description": "Computer Guid for the third slave database.",
"physical-backup-cron": { "type": "string",
"title": "Mariabackup cron definition", "default": ""
"description": "Physical backup cron expression represents a set of times, using cron format.", },
"type": "string", "-sla-4-computer_guid": {
"default": "0 1 * * *" "title": "Slave 4 Computer Guid",
}, "description": "Computer Guid for the fourth slave database.",
"proxy-cpu-cores": { "type": "string",
"title": "Proxy Cpu cores", "default": ""
"description": "Proxy Cpu cores. Default: 2", },
"type": "integer", "proxysql-user": {
"default": 2, "title": "Proxysql username",
"minimum": 1 "description": "Proxysql external user, default is 'external'.",
}, "type": "string",
"proxy-memory": { "default": "external"
"title": "Proxy Memory usage in giga bytes", },
"description": "Proxy Memory usage in giga bytes. Default: 1G", "proxy-tags": {
"type": "integer", "title": "Proxy tag list",
"default": 1, "description": "playbook configuration tags. Default: [\"pkg\", \"masterslave\", \"linux\", \"noreadwritesplit\"]",
"minimum": 1 "type": "array",
}, "items": {
"db-cpu-cores": { "type": "string"
"title": "Database Cpu cores", },
"description": "Database Cpu cores. Default: 2", "default": [
"type": "integer", "pkg",
"default": 2, "masterslave",
"minimum": 1 "linux",
}, "noreadwritesplit"
"db-disk-iops": { ]
"title": "Database Rnd IO/s", },
"description": "Rnd IO/s in seconds for micro service VM (default 300).", "logical-backup-cron": {
"type": "integer", "title": "Mysqldump backup cron definition.",
"default": 300 "description": "Logical backup cron expression represents a set of times, using cron format.",
}, "type": "string",
"db-memory": { "default": "0 21 * * *"
"title": "Database memory in M", },
"description": "Memory in M for micro service VM (default 256)", "physical-backup-cron": {
"type": "integer", "title": "Mariabackup cron definition",
"default": 256, "description": "Physical backup cron expression represents a set of times, using cron format.",
"minimum": 256, "type": "string",
"multipleOf": 256 "default": "0 1 * * *"
}, },
"db-memory-shared-pct": { "proxy-cpu-cores": {
"title": "Percent memory shared per buffer", "title": "Proxy Cpu cores",
"description": "Percent memory shared per buffer (default \"threads:16,innodb:60,myisam:10,aria:10,rocksdb:1,tokudb:1,s3:1,archive:1,querycache:0\")", "description": "Proxy Cpu cores. Default: 2",
"type": "string", "type": "integer",
"default": "threads:16,innodb:60,myisam:10,aria:10,rocksdb:1,tokudb:1,s3:1,archive:1,querycache:0" "default": 2,
}, "minimum": 1
"db-memory-threaded-pct": { },
"title": "Percent memory allocted per threads", "proxy-memory": {
"description": "Percent memory allocted per threads. (default \"tmp:70,join:20,sort:10\")", "title": "Proxy Memory usage in giga bytes",
"type": "string", "description": "Proxy Memory usage in giga bytes. Default: 1G",
"default": "tmp:70,join:20,sort:10" "type": "integer",
}, "default": 1,
"innodb-file-per-table": { "minimum": 1
"title": "enable Innodb file per table", },
"description": "enable Innodb file per table. Possible value: 0=disabled, 1=enabled", "db-cpu-cores": {
"type": "integer", "title": "Database Cpu cores",
"default": 1, "description": "Database Cpu cores. Default: 2",
"minimum": 0, "type": "integer",
"maximum": 1 "default": 2,
}, "minimum": 1
"use-ipv6": { },
"title": "Mariadb server listen on IPv6", "db-disk-iops": {
"description": "Listen on IPv6 instead of IPv4.", "title": "Database Rnd IO/s",
"type": "boolean", "description": "Rnd IO/s in seconds for micro service VM (default 300).",
"default": true "type": "integer",
}, "default": 300
"failover-mode": { },
"title": "Failover mode", "db-memory": {
"description": "Failover is manual or automatic (default \"manual\").", "title": "Database memory in M",
"type": "string", "description": "Memory in M for micro service VM (default 256)",
"default": "manual", "type": "integer",
"default": 256,
"minimum": 256,
"multipleOf": 256
},
"db-memory-shared-pct": {
"title": "Percent memory list shared per buffer",
"description": "Percent memory shared per buffer. Default: [\"threads:16\", \"innodb:60\", \"myisam:10\", \"aria:10\", \"rocksdb:1\", \"tokudb:1\", \"s3:1\", \"archive:1\", \"querycache:0\"]",
"type": "array",
"items": {
"type": "string"
},
"default": [
"threads:16",
"innodb:60",
"myisam:10",
"aria:10",
"rocksdb:1",
"tokudb:1",
"s3:1",
"archive:1",
"querycache:0"
]
},
"db-memory-threaded-pct": {
"title": "Percent memory allocted per threads",
"description": "Percent memory allocted per threads. Default: [\"tmp:70\", \"join:20\", \"sort:10\"]",
"type": "array",
"items": {
"type": "string"
},
"default": [
"tmp:70",
"join:20",
"sort:10"
]
},
"innodb-file-per-table": {
"title": "enable Innodb file per table",
"description": "enable Innodb file per table. Possible value: 0=disabled, 1=enabled",
"type": "integer",
"default": 1,
"minimum": 0,
"maximum": 1
},
"use-ipv6": {
"title": "Mariadb server listen on IPv6",
"description": "Listen on IPv6 instead of IPv4.",
"type": "boolean",
"default": true
},
"failover-mode": {
"title": "Failover mode",
"description": "Failover is manual or automatic (default \"manual\").",
"type": "string",
"default": "manual",
"enum": [ "enum": [
"manual", "manual",
"automatic" "automatic"
] ]
},
}, "failover-limit": {
"failover-limit": { "title": "Failover amount limit",
"title": "Failover amount limit", "description": "Failover is canceld if already failover this number of time (0: unlimited) (default 5).",
"description": "Failover is canceld if already failover this number of time (0: unlimited) (default 5).", "type": "integer",
"type": "integer", "default": 5
"default": 5 },
}, "failover-falsepositive-heartbeat": {
"failover-falsepositive-heartbeat": { "title": "Failover check slaves do not receive heartbeat",
"title": "Failover check slaves do not receive heartbeat", "description": "Failover checks that slaves do not receive heartbeat (default true).",
"description": "Failover checks that slaves do not receive heartbeat (default true).", "type": "boolean",
"type": "boolean", "default": true
"default": true },
}, "failover-falsepositive-heartbeat-timeout": {
"failover-falsepositive-heartbeat-timeout": { "title": "Failover check slaves do not receive heartbeat timeout",
"title": "Failover check slaves do not receive heartbeat timeout", "description": "Failover checks that slaves do not receive heartbeat detection timeout (default 3).",
"description": "Failover checks that slaves do not receive heartbeat detection timeout (default 3).", "type": "integer",
"type": "integer", "default": 3
"default": 3 },
}, "failover-falsepositive-ping-counter": {
"failover-falsepositive-ping-counter": { "title": "Failover amount of ping failures",
"title": "Failover amount of ping failures", "description": "Failover after this number of ping failures (interval 1s) (default 5).",
"description": "Failover after this number of ping failures (interval 1s) (default 5).", "type": "integer",
"type": "integer", "default": 5
"default": 5 },
}, "failover-max-slave-delay": {
"failover-max-slave-delay": { "title": "Failover election ignore slave with replication delay",
"title": "Failover election ignore slave with replication delay", "description": "Election ignore slave with replication delay over this time in sec (default 30).",
"description": "Election ignore slave with replication delay over this time in sec (default 30).", "type": "integer",
"type": "integer", "default": 30
"default": 30 },
}, "failover-readonly-state": {
"failover-readonly-state": { "title": "Failover Switchover set slaves as read-only",
"title": "Failover Switchover set slaves as read-only", "description": "Failover Switchover set slaves as read-only (default true).",
"description": "Failover Switchover set slaves as read-only (default true).", "type": "boolean",
"type": "boolean", "default": true
"default": true },
}, "failover-restart-unsafe": {
"failover-restart-unsafe": { "title": "Failover when cluster down if a slave is start first",
"title": "Failover when cluster down if a slave is start first", "description": "Failover when cluster down if a slave is start first.",
"description": "Failover when cluster down if a slave is start first.", "type": "boolean",
"type": "boolean", "default": false
"default": false },
}, "failover-time-limit": {
"failover-time-limit": { "title": "Cancel failover if time in sec not passed after previous failover",
"title": "Cancel failover if time in sec not passed after previous failover", "description": "Failover is canceled if timer in sec is not passed with previous failover (0: do not wait).",
"description": "Failover is canceled if timer in sec is not passed with previous failover (0: do not wait).", "type": "integer",
"type": "integer", "default": 0
"default": 0 },
}, "switchover-at-equal-gtid": {
"switchover-at-equal-gtid": { "title": "Switchover only when slaves are fully in sync",
"title": "Switchover only when slaves are fully in sync", "description": "Switchover only when slaves are fully in sync.",
"description": "Switchover only when slaves are fully in sync.", "type": "boolean",
"type": "boolean", "default": false
"default": false },
}, "switchover-slave-wait-catch": {
"switchover-slave-wait-catch": { "title": "Switchover wait for slave to catch with replication",
"title": "Switchover wait for slave to catch with replication", "description": "Switchover wait for slave to catch with replication, not needed in GTID mode but enable to detect possible issues like witing on old master (default true).",
"description": "Switchover wait for slave to catch with replication, not needed in GTID mode but enable to detect possible issues like witing on old master (default true).", "type": "boolean",
"type": "boolean", "default": true
"default": true },
}, "switchover-wait-kill": {
"switchover-wait-kill": { "title": "Switchover wait ms before killing threads on demoted master",
"title": "Switchover wait ms before killing threads on demoted master", "description": "Switchover wait this many milliseconds before killing threads on demoted master (default 5000).",
"description": "Switchover wait this many milliseconds before killing threads on demoted master (default 5000).", "type": "integer",
"type": "integer", "default": 5000
"default": 5000 },
}, "switchover-wait-trx": {
"switchover-wait-trx": { "title": "Cancel switchover after timeout seconds if can't aquire FTWRL",
"title": "Cancel switchover after timeout seconds if can't aquire FTWRL", "description": "Switchover is cancel after this timeout in second if can't aquire FTWRL (default 10).",
"description": "Switchover is cancel after this timeout in second if can't aquire FTWRL (default 10).", "type": "integer",
"type": "integer", "default": 10
"default": 10 },
}, "switchover-wait-write-query": {
"switchover-wait-write-query": { "title": "Cancel switchover after timeout if a write query is running",
"title": "Cancel switchover after timeout if a write query is running", "description": "Switchover is canceled if a write query is running for this time (default 10).",
"description": "Switchover is canceled if a write query is running for this time (default 10).", "type": "integer",
"type": "integer", "default": 10
"default": 10 }
} },
}, "type": "object"
"type": "object" }
} },
}, "type": "object"
"type": "object" }
} }
}
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{% set ip = (ipv6_set | list)[0] -%} {% set ip = (ipv6_set | list)[0] -%}
{% set ipv4 = (ipv4_set | list)[0] -%} {% set ipv4 = (ipv4_set | list)[0] -%}
{% set cluster_list = [] -%} {% set cluster_list = [] -%}
{% set tags = "gtidstrict,bind,pkg,innodb,noquerycache,slow,pfs,linux,readonly,diskmonitor,sqlerror,compressbinlog,bm4ci,mroonga,utctime,readcommitted,nohandshake" -%} {% set tag_list = ["gtidstrict", "bind", "pkg", "innodb", "noquerycache", "slow", "pfs", "linux", "readonly", "diskmonitor", "sqlerror", "compressbinlog", "bm4ci", "mroonga", "utctime", "readcommitted", "nohandshake"] -%}
{% set frontend_parameter_dict = slapparameter_dict.get('slave-frontend', {}) -%} {% set frontend_parameter_dict = slapparameter_dict.get('slave-frontend', {}) -%}
[directory] [directory]
...@@ -60,7 +60,7 @@ mode = 755 ...@@ -60,7 +60,7 @@ mode = 755
{% do mariadb_dict.__setitem__('computer-memory-percent-threshold', 80) -%} {% do mariadb_dict.__setitem__('computer-memory-percent-threshold', 80) -%}
{% set default_parameter_dict = {"cluster1": {"name": "cluster1", "db-prefered-master": "", {% set default_parameter_dict = {"cluster1": {"name": "cluster1", "db-prefered-master": "",
"database-amount": 2, "proxysql-user": "external", "proxy-tags": "pkg,masterslave,linux,noreadwritesplit", "database-amount": 2, "proxysql-user": "external",
"logical-backup-cron": "0 21 * * *", "physical-backup-cron": "0 1 * * *"}} -%} "logical-backup-cron": "0 21 * * *", "physical-backup-cron": "0 1 * * *"}} -%}
{% for name, parameter_dict in slapparameter_dict.get('repman-cluster-dict', default_parameter_dict).items() -%} {% for name, parameter_dict in slapparameter_dict.get('repman-cluster-dict', default_parameter_dict).items() -%}
...@@ -150,7 +150,8 @@ proxysql-servers-ipv6 = [{{ ip }}] ...@@ -150,7 +150,8 @@ proxysql-servers-ipv6 = [{{ ip }}]
password = ${repman-parameter:password} password = ${repman-parameter:password}
proxysql-partition = ${buildout:directory} proxysql-partition = ${buildout:directory}
receiver-port-list = {{ receiver_port_list | join(',') }} receiver-port-list = {{ receiver_port_list | join(',') }}
proxy-tags = {{ parameter_dict.get("proxy-tags", "pkg,masterslave,linux,noreadwritesplit") }} enabled-tags = {{ slapparameter_dict.get("tag-list", tag_list) | join(',') }}
proxy-tags = {{ parameter_dict.get("proxy-tags", ["pkg", "masterslave", "linux", "noreadwritesplit"]) | join(',') }}
logical-backup-cron = {{ parameter_dict.get("logical-backup-cron", "0 22 * * *") }} logical-backup-cron = {{ parameter_dict.get("logical-backup-cron", "0 22 * * *") }}
physical-backup-cron = {{ parameter_dict.get("physical-backup-cron", "0 0 * * *") }} physical-backup-cron = {{ parameter_dict.get("physical-backup-cron", "0 0 * * *") }}
proxy-cpu-cores = {{ parameter_dict.get("proxy-cpu-cores", 2) }} proxy-cpu-cores = {{ parameter_dict.get("proxy-cpu-cores", 2) }}
...@@ -158,8 +159,8 @@ proxy-memory = {{ parameter_dict.get("proxy-memory", 1) }} ...@@ -158,8 +159,8 @@ proxy-memory = {{ parameter_dict.get("proxy-memory", 1) }}
db-cpu-cores = {{ parameter_dict.get("db-cpu-cores", 2) }} db-cpu-cores = {{ parameter_dict.get("db-cpu-cores", 2) }}
db-disk-iops = {{ parameter_dict.get("db-disk-iops", 300) }} db-disk-iops = {{ parameter_dict.get("db-disk-iops", 300) }}
db-memory = {{ parameter_dict.get("db-memory", 256) }} db-memory = {{ parameter_dict.get("db-memory", 256) }}
db-memory-shared-pct = {{ parameter_dict.get("db-memory-shared-pct", "threads:16,innodb:60,myisam:10,aria:10,rocksdb:1,tokudb:1,s3:1,archive:1,querycache:0") }} db-memory-shared-pct = {{ parameter_dict.get("db-memory-shared-pct", ["threads:16", "innodb:60", "myisam:10", "aria:10", "rocksdb:1", "tokudb:1", "s3:1", "archive:1", "querycache:0"]) | join(',') }}
db-memory-threaded-pct = {{ parameter_dict.get("db-memory-threaded-pct", "tmp:70,join:20,sort:10") }} db-memory-threaded-pct = {{ parameter_dict.get("db-memory-threaded-pct", ["tmp:70", "join:20", "sort:10"]) | join(',') }}
# failover # failover
failover-mode = {{ parameter_dict.get('failover-mode', 'manual') }} failover-mode = {{ parameter_dict.get('failover-mode', 'manual') }}
failover-limit = {{ parameter_dict.get('failover-limit', 5) }} failover-limit = {{ parameter_dict.get('failover-limit', 5) }}
...@@ -336,11 +337,11 @@ sysbench-bin = {{ sysbench_location }}/bin/sysbench ...@@ -336,11 +337,11 @@ sysbench-bin = {{ sysbench_location }}/bin/sysbench
restic-bin = {{ restic_bin_location }} restic-bin = {{ restic_bin_location }}
mail-from = {{ slapparameter_dict.get("mail-from", "mrm@localhost") }} mail-from = {{ slapparameter_dict.get("mail-from", "mrm@localhost") }}
mail-smtp-addr = {{ slapparameter_dict.get("mail-smtp-addr", "localhost:25") }} mail-smtp-addr = {{ slapparameter_dict.get("mail-smtp-addr", "localhost") }}
mail-smtp-port = {{ slapparameter_dict.get("mail-smtp-port", "25") }}
mail-smtp-password = {{ slapparameter_dict.get("mail-smtp-password", "") }} mail-smtp-password = {{ slapparameter_dict.get("mail-smtp-password", "") }}
mail-smtp-user = {{ slapparameter_dict.get("mail-smtp-user", "") }} mail-smtp-user = {{ slapparameter_dict.get("mail-smtp-user", "") }}
mail-to = {{ slapparameter_dict.get("mail-to", "") }} mail-to = {{ slapparameter_dict.get("mail-to", "") }}
enabled-tags = {{ slapparameter_dict.get("tags", tags) }}
http-session-lifetime = {{ slapparameter_dict.get("http-session-lifetime", 86400) }} http-session-lifetime = {{ slapparameter_dict.get("http-session-lifetime", 86400) }}
http-refresh-interval = {{ slapparameter_dict.get("http-refresh-interval", 4) }} http-refresh-interval = {{ slapparameter_dict.get("http-refresh-interval", 4) }}
...@@ -354,7 +355,7 @@ command = ...@@ -354,7 +355,7 @@ command =
{{ rsync_location }}/bin/rsync -av dashboard ${repman:root-dir}/ {{ rsync_location }}/bin/rsync -av dashboard ${repman:root-dir}/
update-command = ${:command} update-command = ${:command}
[replication-manager-reload] [replication-manager-reload]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ template_repman_manager_sh }} template = {{ template_repman_manager_sh }}
......
...@@ -22,6 +22,7 @@ proxysql-bootstrap = true ...@@ -22,6 +22,7 @@ proxysql-bootstrap = true
proxysql-admin-port = {{ parameter_dict['proxy-admin-port'] }} proxysql-admin-port = {{ parameter_dict['proxy-admin-port'] }}
proxysql-password = "{{ parameter_dict['password'] }}" proxysql-password = "{{ parameter_dict['password'] }}"
prov-db-tags = "{{ parameter_dict['enabled-tags'] }}"
prov-proxy-tags = "{{ parameter_dict['proxy-tags'] }}" prov-proxy-tags = "{{ parameter_dict['proxy-tags'] }}"
monitoring-scheduler = true monitoring-scheduler = true
......
...@@ -53,14 +53,13 @@ backup-mysqldump-path = "{{ parameter_dict['mysqldump-path'] }}" ...@@ -53,14 +53,13 @@ backup-mysqldump-path = "{{ parameter_dict['mysqldump-path'] }}"
# Alert email sender (default "mrm@localhost") # Alert email sender (default "mrm@localhost")
mail-from = "{{ parameter_dict['mail-from'] }}" mail-from = "{{ parameter_dict['mail-from'] }}"
# Alert email SMTP server address, in host:[port] format (default "localhost:25") # Alert email SMTP server address, in host:[port] format (default "localhost:25")
mail-smtp-addr = "{{ parameter_dict['mail-smtp-addr'] }}" mail-smtp-addr = "{{ parameter_dict['mail-smtp-addr'] }}:{{ parameter_dict['mail-smtp-port'] }}"
mail-smtp-password = "{{ parameter_dict['mail-smtp-password'] }}" mail-smtp-password = "{{ parameter_dict['mail-smtp-password'] }}"
mail-smtp-user = "{{ parameter_dict['mail-smtp-user'] }}" mail-smtp-user = "{{ parameter_dict['mail-smtp-user'] }}"
# Alert email recipients, separated by commas # Alert email recipients, separated by commas
mail-to = "{{ parameter_dict['mail-to'] }}" mail-to = "{{ parameter_dict['mail-to'] }}"
prov-orchestrator = "slapos" prov-orchestrator = "slapos"
prov-db-tags = "{{ parameter_dict['enabled-tags'] }}"
sysbench-binary-path = "{{ parameter_dict['sysbench-bin'] }}" sysbench-binary-path = "{{ parameter_dict['sysbench-bin'] }}"
# Number of threads to run benchmark (default 4) # Number of threads to run benchmark (default 4)
......
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