Merge "Optimize kitchen tests for Travis CI"
diff --git a/README.rst b/README.rst
index 17410a4..eccd9a0 100644
--- a/README.rst
+++ b/README.rst
@@ -20,6 +20,7 @@
nopreempt: True
priority: 100 (highest priority must be on primary server, different for cluster members)
virtual_router_id: 51
+ auth_type: AH
password: pass
address: 192.168.10.1
interface: eth0
@@ -27,6 +28,7 @@
nopreempt: True
priority: 150 (highest priority must be on primary server, different for cluster members)
virtual_router_id: 52
+ auth_type: PASS
password: pass
address: 10.0.0.5
interface: eth1
diff --git a/keepalived/files/keepalived.conf b/keepalived/files/keepalived.conf
index bb88504..cdff79c 100644
--- a/keepalived/files/keepalived.conf
+++ b/keepalived/files/keepalived.conf
@@ -46,7 +46,7 @@
{%- endif %}
advert_int 1
authentication {
- auth_type PASS
+ auth_type {{ instance.get('auth_type', 'AH') }}
auth_pass {{ instance.password }}
}
virtual_ipaddress {
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 3f42101..9451611 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -110,7 +110,7 @@
}
salt_run() {
- [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+ [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
}