keepalived: Bring in the fix for iteritems for python3

This change moves the keepalived role version to commit b13e08 in
order to bring the fix applied in upstream, switching from iteritems
to items for python3. [1]

The flavor ha is enabled back due to incorporating the fix to xci and
the note in README.rst is removed as well.

https://github.com/evrardjp/ansible-keepalived/commit/b13e0840b09154a6d2470f71fea8eaa968525c5b

Change-Id: I6e03f579f1107475f4b4adf54699fc4f924beec3
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/xci/README.rst b/xci/README.rst
index b9909ed..4df2aae 100644 (file)
--- a/xci/README.rst
+++ b/xci/README.rst
@@ -208,9 +208,6 @@ specified directories, and use them instead of cloning those on every run.
 Limitations, Known Issues, and Improvements
 ===========================================
 
-Please note that the deployment of flavor ha is currently disabled due to an
-upstream issue. See `this link <https://jira.opnfv.org/browse/RELENG-301>`_.
-
 The complete list can be seen using `this link <https://jira.opnfv.org/issues/?filter=11616>`_.
 
 =========

diff --git a/xci/file/ansible-role-requirements.yml b/xci/file/ansible-role-requirements.yml
index efca0fb..6bf7b3c 100644 (file)
--- a/xci/file/ansible-role-requirements.yml
+++ b/xci/file/ansible-role-requirements.yml
@@ -40,7 +40,7 @@
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: 3.0.1
+  version: b13e0840b09154a6d2470f71fea8eaa968525c5b
 - name: lxc_container_create
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create

diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index fc3f63b..db0a714 100755 (executable)
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -72,16 +72,6 @@ if [[ $OS_FAMILY != Debian ]]; then
     exit 1
 fi
 
-# TODO: Get rid of this!!!
-# Flavor HA fails to deploy and currently disabled.
-if [[ $XCI_FLAVOR == ha ]]; then
-    echo ""
-    echo "Error: Sorry, the flavor ha is not currently supported due to an upstream issue!"
-    echo "Info : Available flavors are aio, mini, and ha"
-    echo ""
-    exit 1
-fi
-
 # TODO: The xci playbooks can be put into a playbook which will be done later.
 
 #-------------------------------------------------------------------------------