summaryrefslogtreecommitdiffstats
path: root/deploy/adapters
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-11-26 18:00:55 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-12-01 07:29:39 +0800
commite93d595baf9b3fbbc0ec213ad725ce438772d8a4 (patch)
treee9e2a5e6a3e5abc4cd9a44228e47796c5e86fc4b /deploy/adapters
parenta5d9a6384c09ff8e84c7e6bfefb9b9202b0c2341 (diff)
support libverty on ubuntu
JIRA: COMPASS-169 Change-Id: I4656cf43eb3db0ba61fae4b03416b9c0239bb50b Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters')
-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