summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-08-30 23:52:38 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-08-31 11:05:29 +0000
commit299259acef0a045a159678befe89b9ac15553b11 (patch)
tree1d5eeff4dffb912a824bbf29efc7a690b16f1cbc
parentc0ca672ffeb45efa2f6546af2e8dfc7869df2601 (diff)
cinder: Bring in the fix for cinder online migrations command
This change fixes the bug with cinder online migration command by moving osa version to commit 691c59 and moving the cinder role version to commit 96160f. [1][2] The issue appears when the flavor is set to ha. [1] https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=691c59f25e5d271c670c24d12e8d60fa422441e1 [2] https://review.openstack.org/gitweb?p=openstack/openstack-ansible-os_cinder.git;a=commit;h=96160f084d89355ba62980b1ebbedf0eef7c7b20 Change-Id: I5339d1fd00a1b108f09c1221e5a3cbecc2f35182 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rwxr-xr-xxci/config/pinned-versions2
-rw-r--r--xci/file/ansible-role-requirements.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index e1c110c6..09f618fe 100755
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -24,4 +24,4 @@ export OPNFV_RELENG_VERSION="master"
# HEAD of bifrost "master" as of 29.06.2017
export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"7c9bb5e07c6bc3b42c9a9e8457e5eef511075b38"}
# HEAD of osa "master" as of 23.08.2017
-export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"4d39f2cc29417153780210fc0bb86223387e9968"}
+export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"691c59f25e5d271c670c24d12e8d60fa422441e1"}
diff --git a/xci/file/ansible-role-requirements.yml b/xci/file/ansible-role-requirements.yml
index 6bf7b3cc..8c2f9b0b 100644
--- a/xci/file/ansible-role-requirements.yml
+++ b/xci/file/ansible-role-requirements.yml
@@ -80,7 +80,7 @@
- name: os_cinder
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
- version: 0d0527e8f8d490c65b74981247f6df6f9b7770e7
+ version: 96160f084d89355ba62980b1ebbedf0eef7c7b20
- name: os_glance
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_glance