aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2015-12-02 01:20:22 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-02 01:20:22 +0000
commit59f12c1119da51446dcddc84c903e385645632e5 (patch)
treee4e58abbaf13feae8bdd6c781b527022b33442b4 /deploy/adapters/ansible
parent59450840d28991bef93ffe893fd5cde4173c1ad2 (diff)
parente93d595baf9b3fbbc0ec213ad725ce438772d8a4 (diff)
Merge "support libverty on ubuntu"
Diffstat (limited to 'deploy/adapters/ansible')
-rw-r--r--deploy/adapters/ansible/openstack_liberty/.gitkeep0
-rw-r--r--deploy/adapters/ansible/roles/common/vars/Debian.yml2
-rw-r--r--deploy/adapters/ansible/roles/ha/templates/keepalived.conf6
3 files changed, 3 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/openstack_liberty/.gitkeep b/deploy/adapters/ansible/openstack_liberty/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_liberty/.gitkeep
diff --git a/deploy/adapters/ansible/roles/common/vars/Debian.yml b/deploy/adapters/ansible/roles/common/vars/Debian.yml
index bc273a10..8dce2729 100644
--- a/deploy/adapters/ansible/roles/common/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/common/vars/Debian.yml
@@ -1,7 +1,7 @@
---
packages:
- ubuntu-cloud-keyring
- - python-dev
+ #- python-dev
- openvswitch-datapath-dkms
- openvswitch-switch
- crudini
diff --git a/deploy/adapters/ansible/roles/ha/templates/keepalived.conf b/deploy/adapters/ansible/roles/ha/templates/keepalived.conf
index d6f424cd..c2af86b0 100644
--- a/deploy/adapters/ansible/roles/ha/templates/keepalived.conf
+++ b/deploy/adapters/ansible/roles/ha/templates/keepalived.conf
@@ -14,9 +14,8 @@ vrrp_instance internal_vip {
virtual_router_id {{ vrouter_id_internal }}
state BACKUP
nopreempt
- preempt_delay 30
advert_int 1
- priority 100
+ priority {{ 50 + (host_index[inventory_hostname] * 50) }}
authentication {
auth_type PASS
@@ -33,9 +32,8 @@ vrrp_instance public_vip {
virtual_router_id {{ vrouter_id_public }}
state BACKUP
nopreempt
- preempt_delay 30
advert_int 1
- priority 100
+ priority {{ 50 + (host_index[inventory_hostname] * 50) }}
authentication {
auth_type PASS