From d8cbea84f9448da633bed36c41f12c4bcfd84ffb Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 17 Sep 2018 12:19:01 +0200 Subject: xci: osa: Bump SHAs to the HEAD of the Rocky branch Since Rocky, networking-odl depends on ceilometer and requires it to be installed. Therefore, all odl scenarios need to have ceilometer deployed. Once that is done, we can unfreeze n-odl repo. Besides, we need to introduce a SHA bump for neutron and ceilometer to include the latest changes to support this fix Ceilometer should be git cloned always, otherwise repo_build will fail as ceilometer is now part of requirements.txt [mchandras: Instead of just bumping selective network related roles, lets just do a complete sha bump for stable/rocky] deploy-scenario:os-odl-sfc installer-type:osa Change-Id: I81a39436e4ff648faabda4e82fce1d3f14615741 Signed-off-by: Manuel Buil Signed-off-by: Markos Chandras --- xci/config/pinned-versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xci/config') diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 9b42fa8e..c4bedaff 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -35,8 +35,8 @@ export BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"b29646d0e export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"e89450c44e41ec2ddada7909e63f1edc1aa1afdd"} # HEAD of ironic-inspector-client "stable/rocky" as of 11.10.2018 export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"cb370b776aa274b0ecfacfb29fa5035670839308"} -# HEAD of osa "stable/rocky" as of 07.09.2018 -export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"ff6161e7f08b8ffe9ff6e0552517ea3f10292cf8"} +# HEAD of osa "stable/rocky" as of 05.10.2018 +export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"cf2b7bab51dd7bc704460f8ff5abe2f0540ed833"} export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \ ${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \ | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p') -- cgit