summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/ha/templates
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-09-18 14:55:04 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-09-18 15:23:38 +0800
commit95343d26c8d2cc9789b87a77748b3e7becd548ca (patch)
treef2850e996dd61b46829623d088c329f94b6a9c88 /deploy/adapters/ansible/roles/ha/templates
parent28420aea06c161605ba07449daa38436d0911e20 (diff)
separate the mgmt vip from public vip, remove HA_VIP
Change-Id: Iaa877b7ce93ba9c12bc9be6f3bd101779f07ae9c JIRA: COMPASS-51
Diffstat (limited to 'deploy/adapters/ansible/roles/ha/templates')
-rw-r--r--deploy/adapters/ansible/roles/ha/templates/failover.j22
-rw-r--r--deploy/adapters/ansible/roles/ha/templates/haproxy.cfg20
-rw-r--r--deploy/adapters/ansible/roles/ha/templates/keepalived.conf53
3 files changed, 41 insertions, 34 deletions
diff --git a/deploy/adapters/ansible/roles/ha/templates/failover.j2 b/deploy/adapters/ansible/roles/ha/templates/failover.j2
index ebfa65f8..3b08cf2d 100644
--- a/deploy/adapters/ansible/roles/ha/templates/failover.j2
+++ b/deploy/adapters/ansible/roles/ha/templates/failover.j2
@@ -11,7 +11,7 @@ except:
pass
LOG.basicConfig(format='%(asctime)s %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p', filename=LOG_FILE,level=LOG.DEBUG)
-ha_vip = {{ HA_VIP }}
+ha_vip = {{ internal_vip.ip }}
LOG.info("ha_vip: %s" % ha_vip)
#ha_vip = "10.1.0.50"
diff --git a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
index 169182da..3c18d362 100644
--- a/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
+++ b/deploy/adapters/ansible/roles/ha/templates/haproxy.cfg
@@ -26,7 +26,7 @@ defaults
retries 5
listen proxy-glance_registry_cluster
- bind {{ HA_VIP }}:9191
+ bind {{ internal_vip.ip }}:9191
option tcpka
option tcplog
balance source
@@ -35,7 +35,7 @@ listen proxy-glance_registry_cluster
{% endfor %}
listen proxy-glance_api_cluster
- bind {{ HA_VIP }}:9292
+ bind {{ internal_vip.ip }}:9292
option tcpka
option httpchk
option tcplog
@@ -45,7 +45,7 @@ listen proxy-glance_api_cluster
{% endfor %}
listen proxy-nova-novncproxy
- bind {{ HA_VIP }}:6080
+ bind {{ internal_vip.ip }}:6080
option tcpka
option tcplog
balance source
@@ -54,7 +54,7 @@ listen proxy-nova-novncproxy
{% endfor %}
listen proxy-network
- bind {{ HA_VIP }}:9696
+ bind {{ internal_vip.ip }}:9696
option tcpka
option tcplog
balance source
@@ -63,7 +63,7 @@ listen proxy-network
{% endfor %}
listen proxy-volume
- bind {{ HA_VIP }}:8776
+ bind {{ internal_vip.ip }}:8776
option tcpka
option httpchk
option tcplog
@@ -73,7 +73,7 @@ listen proxy-volume
{% endfor %}
listen proxy-keystone_admin_cluster
- bind {{ HA_VIP }}:35357
+ bind {{ internal_vip.ip }}:35357
option tcpka
option httpchk
option tcplog
@@ -83,7 +83,7 @@ listen proxy-keystone_admin_cluster
{% endfor %}
listen proxy-keystone_public_internal_cluster
- bind {{ HA_VIP }}:5000
+ bind {{ internal_vip.ip }}:5000
option tcpka
option httpchk
option tcplog
@@ -93,7 +93,7 @@ listen proxy-keystone_public_internal_cluster
{% endfor %}
listen proxy-nova_compute_api_cluster
- bind {{ HA_VIP }}:8774
+ bind {{ internal_vip.ip }}:8774
mode tcp
option httpchk
option tcplog
@@ -103,7 +103,7 @@ listen proxy-nova_compute_api_cluster
{% endfor %}
listen proxy-nova_metadata_api_cluster
- bind {{ HA_VIP }}:8775
+ bind {{ internal_vip.ip }}:8775
option tcpka
option tcplog
balance source
@@ -112,7 +112,7 @@ listen proxy-nova_metadata_api_cluster
{% endfor %}
listen proxy-cinder_api_cluster
- bind {{ HA_VIP }}:8776
+ bind {{ internal_vip.ip }}:8776
mode tcp
option httpchk
option tcplog
diff --git a/deploy/adapters/ansible/roles/ha/templates/keepalived.conf b/deploy/adapters/ansible/roles/ha/templates/keepalived.conf
index f9f91915..f1e6db5d 100644
--- a/deploy/adapters/ansible/roles/ha/templates/keepalived.conf
+++ b/deploy/adapters/ansible/roles/ha/templates/keepalived.conf
@@ -1,41 +1,48 @@
global_defs {
-
- notification_email{
- root@huawei.com
- }
-
- notification_email_from keepalived@huawei.com
-
- smtp_server localhost
-
- smtp_connect_timeout 30
-
- router_id NodeA
-
+ router_id {{ inventory_hostname }}
}
-vrrp_instance VI_1 {
- interface {{ INTERNAL_INTERFACE }}
- virtual_router_id 51
+vrrp_instance internal_vip {
+ interface {{ internal_vip.interface }}
+ virtual_router_id {{ vrouter_id_internal }}
state BACKUP
nopreempt
+ preempt_delay 30
advert_int 1
-{% for host in groups['controller'] %}
-{% if host == inventory_hostname %}
- priority {{ 100 - loop.index0 * 5 }}
-{% endif %}
-{% endfor %}
+ priority 100
authentication {
auth_type PASS
- auth_pass 1111
+ auth_pass 1234
}
virtual_ipaddress {
- {{ HA_VIP }} dev {{ INTERNAL_INTERFACE }}
+ {{ internal_vip.ip }}/{{ internal_vip.netmask }} dev {{ internal_vip.interface }}
}
notify_master "/usr/local/bin/notify.sh master"
notify_backup "/usr/local/bin/notify.sh backup"
+
}
+#vrrp_instance public_vip {
+# interface {{ network_cfg.public_vip.interface }}
+# virtual_router_id {{ vrouter_id_public }}
+# state BACKUP
+# nopreempt
+# preempt_delay 30
+# advert_int 1
+# priority 100
+#
+# authentication {
+# auth_type PASS
+# auth_pass 4321
+# }
+#
+# virtual_ipaddress {
+# {{ network_cfg.public_vip.ip }}/{{ network_cfg.public_vip.netmask }} dev {{ network_cfg.public_vip.interface }}
+# }
+#
+#}
+#
+# notify_backup "/usr/local/bin/notify.sh backup"