diff --git a/pillar/id/anna_infra_opensuse_org.sls b/pillar/id/anna_infra_opensuse_org.sls index c19adee..54324ed 100644 --- a/pillar/id/anna_infra_opensuse_org.sls +++ b/pillar/id/anna_infra_opensuse_org.sls @@ -2,6 +2,7 @@ grains: city: nuremberg country: de roles: + - ha - proxy - proxy_master - ntp diff --git a/pillar/id/elsa_infra_opensuse_org.sls b/pillar/id/elsa_infra_opensuse_org.sls index 06d115f..0cc2452 100644 --- a/pillar/id/elsa_infra_opensuse_org.sls +++ b/pillar/id/elsa_infra_opensuse_org.sls @@ -2,6 +2,7 @@ grains: city: nuremberg country: de roles: + - ha - proxy - proxy_slave - ntp diff --git a/pillar/role/ha.sls b/pillar/role/ha.sls new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/pillar/role/ha.sls @@ -0,0 +1 @@ +# diff --git a/pillar/role/proxy.sls b/pillar/role/proxy.sls index 6fc877c..e9be8d5 100644 --- a/pillar/role/proxy.sls +++ b/pillar/role/proxy.sls @@ -35,6 +35,3 @@ keepalived: - 195.135.221.143/25 dev external - 2001:67c:2178:8::18/64 dev external virtual_router_id: 51 -zypper: - packages: - monitoring-plugins-keepalived: {} diff --git a/salt/profile/ha.sls b/salt/profile/ha.sls new file mode 100644 index 0000000..101caf2 --- /dev/null +++ b/salt/profile/ha.sls @@ -0,0 +1,5 @@ +include: + - keepalived + +monitoring-plugins-keepalived: + pkg.installed diff --git a/salt/profile/proxy/init.sls b/salt/profile/proxy/init.sls index 901d6bd..8010086 100644 --- a/salt/profile/proxy/init.sls +++ b/salt/profile/proxy/init.sls @@ -1,3 +1,2 @@ include: - - keepalived - profile.proxy.haproxy-scripts diff --git a/salt/role/ha.sls b/salt/role/ha.sls new file mode 100644 index 0000000..4a354f5 --- /dev/null +++ b/salt/role/ha.sls @@ -0,0 +1,2 @@ +include: + - profile.ha