aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-08 05:28:07 +0000
committerSam Yaple <sam@yaple.net>2015-08-08 05:28:07 +0000
commit1ab8bc184c7d8dc4af076ce569cf91cc79285b10 (patch)
treefcbf1d6c4201af08eb1453e27153662a9e8d1a12
parentcc8fedb910f007066194647fa464c9bfd4aa053b (diff)
downloadkolla-1ab8bc184c7d8dc4af076ce569cf91cc79285b10.tar.gz
kolla-1ab8bc184c7d8dc4af076ce569cf91cc79285b10.zip
Fixes group name for keepalived.conf
Also included is removing the executable bit on haproxy.cfg.j2 as it should not have those permissions in the repo. It has no affect on the templating process. Change-Id: I9c76e528896bdf1799b8eeb62ae77bc4ad0b4449 Closes-Bug: #1482832
-rw-r--r--[-rwxr-xr-x]ansible/roles/haproxy/templates/haproxy.cfg.j20
-rw-r--r--ansible/roles/haproxy/templates/keepalived.conf.j22
2 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 11a334099..11a334099 100755..100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
diff --git a/ansible/roles/haproxy/templates/keepalived.conf.j2 b/ansible/roles/haproxy/templates/keepalived.conf.j2
index baba1fda6..232ff8e46 100644
--- a/ansible/roles/haproxy/templates/keepalived.conf.j2
+++ b/ansible/roles/haproxy/templates/keepalived.conf.j2
@@ -9,7 +9,7 @@ vrrp_instance Floating {
state MASTER
interface {{ api_interface }}
virtual_router_id 51
- priority {{ groups['rabbitmq'].index(inventory_hostname) }}
+ priority {{ groups['haproxy'].index(inventory_hostname) }}
advert_int 1
virtual_ipaddress {
{{ kolla_internal_address }}