diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-08-31 12:35:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-31 12:35:09 +0000 |
| commit | 5dc8e65d6bd321024608d4374a1c241a4987ba63 (patch) | |
| tree | e853a275758b3b5186919a306d4f7aad054e8ba7 | |
| parent | 7bddf7e7d290f835ae62cdc242cb463b8ceb58d5 (diff) | |
| parent | c0ca672ffeb45efa2f6546af2e8dfc7869df2601 (diff) | |
Merge "keepalived: Bring in the fix for iteritems for python3"
| -rw-r--r-- | xci/README.rst | 3 | ||||
| -rw-r--r-- | xci/file/ansible-role-requirements.yml | 2 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 10 |
3 files changed, 1 insertions, 14 deletions
diff --git a/xci/README.rst b/xci/README.rst index 5ba34d5e..462fffd1 100644 --- a/xci/README.rst +++ b/xci/README.rst @@ -229,9 +229,6 @@ used throughout the deployment. 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 efca0fbf..6bf7b3cc 100644 --- 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 fc3f63b5..db0a714e 100755 --- 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. #------------------------------------------------------------------------------- |