From d8e499e26b4aa9ce431c1c1014b53a9a8908502f Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Nov 30 2017 08:22:19 +0000 Subject: Merge branch 'fix_keepalived_vrrp_instance' into 'production' more vrrp_instances -> vrrp_instance fixes See merge request infra/salt!118 --- diff --git a/pillar/role/proxy_master.sls b/pillar/role/proxy_master.sls index b80925a..372a6e7 100644 --- a/pillar/role/proxy_master.sls +++ b/pillar/role/proxy_master.sls @@ -1,5 +1,5 @@ keepalived: - vrrp_instances: + vrrp_instance: VRRP_OPENSUSE_PRIVATE: priority: 110 state: MASTER diff --git a/pillar/role/proxy_slave.sls b/pillar/role/proxy_slave.sls index f8aaa91..47c3fdd 100644 --- a/pillar/role/proxy_slave.sls +++ b/pillar/role/proxy_slave.sls @@ -1,5 +1,5 @@ keepalived: - vrrp_instances: + vrrp_instance: VRRP_OPENSUSE_PRIVATE: priority: 100 state: BACKUP diff --git a/pillar/secrets/role/proxy.sls b/pillar/secrets/role/proxy.sls index 365987e..5088afb 100644 --- a/pillar/secrets/role/proxy.sls +++ b/pillar/secrets/role/proxy.sls @@ -1,7 +1,7 @@ #!yaml|gpg keepalived: - vrrp_instances: + vrrp_instance: VRRP_OPENSUSE_PRIVATE: authentication: auth_pass: |