Преглед на файлове

Merge "Fix galera.master and galera.slave enabling"

revert-bumpto57-2
Ales Komarek преди 7 години
родител
ревизия
d550db78f7
променени са 4 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. +2
    -2
      galera/files/debian.cnf
  2. +2
    -2
      galera/files/my.cnf
  3. +2
    -2
      galera/files/my.cnf.container
  4. +2
    -2
      galera/files/my.cnf.init

+ 2
- 2
galera/files/debian.cnf Целия файл

@@ -1,8 +1,8 @@
{%- if pillar.galera.master is defined %}
{%- if pillar.galera.get('master',{}).get('enabled', False) %}
{%- from "galera/map.jinja" import master with context %}
{%- set service = master %}
{%- endif %}
{%- if pillar.galera.slave is defined %}
{%- if pillar.galera.get('slave',{}).get('enabled', False) %}
{%- from "galera/map.jinja" import slave with context %}
{%- set service = slave %}
{%- endif %}

+ 2
- 2
galera/files/my.cnf Целия файл

@@ -1,11 +1,11 @@
# All files in this package is subject to the GPL v2 license
# More information is in the COPYING file in the top directory of this package.
# Copyright (C) 2011 severalnines.com
{%- if pillar.galera.master is defined %}
{%- if pillar.galera.get('master',{}).get('enabled', False) %}
{%- from "galera/map.jinja" import master with context %}
{%- set service = master %}
{%- endif %}
{%- if pillar.galera.slave is defined %}
{%- if pillar.galera.get('slave',{}).get('enabled', False) %}
{%- from "galera/map.jinja" import slave with context %}
{%- set service = slave %}
{%- endif %}

+ 2
- 2
galera/files/my.cnf.container Целия файл

@@ -1,4 +1,4 @@
{%- if pillar.galera.master is defined %}
{%- if pillar.galera.get('master',{}).get('enabled', False) %}
{%- from "galera/map.jinja" import master with context %}
{%- set service = master %}
{%- endif %}
@@ -79,4 +79,4 @@ socket=/var/lib/mysql/mysql.sock
[xtrabackup]
parallel=4
user={{ service.admin.user }}
password={{ service.admin.password }}
password={{ service.admin.password }}

+ 2
- 2
galera/files/my.cnf.init Целия файл

@@ -1,11 +1,11 @@
# All files in this package is subject to the GPL v2 license
# More information is in the COPYING file in the top directory of this package.
# Copyright (C) 2011 severalnines.com
{%- if pillar.galera.master is defined %}
{%- if pillar.galera.get('master',{}).get('enabled', False) %}
{%- from "galera/map.jinja" import master with context %}
{%- set service = master %}
{%- endif %}
{%- if pillar.galera.slave is defined %}
{%- if pillar.galera.get('slave',{}).get('enabled', False) %}
{%- from "galera/map.jinja" import slave with context %}
{%- set service = slave %}
{%- endif %}

Loading…
Отказ
Запис