From 246029cfa3b70cb3e5678a41187b214620f6d507 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 6 Jun 2018 12:24:54 +0100 Subject: xci: OSA: Bump Queens SHAs to fix spice-html5 repo relocation The spice-html5 repository moved from github to its own gitlab hosting and that broke everything. As such, we update the OSA roles which contain the correct URL for the new repository. Change-Id: I3e2883c0436c9c93d2a8a338343ca3a75a1431e4 Signed-off-by: Markos Chandras --- xci/config/pinned-versions | 4 ++-- xci/installer/osa/files/ansible-role-requirements.yml | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index ccfc2704..874ee6ba 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -35,8 +35,8 @@ export BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"1da269b0e export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"84da941fafb905c2debdd9a9ba68ba743af3ce8a"} # HEAD of ironic-inspector-client "master" as of 13.02.2018 export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"b73403fdad3165cfcccbf4b0330d426ae5925e01"} -# HEAD of osa "stable/queens" as of 03.04.2018 -export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"90d0679d209cb494b9a71817c56e2c26c7fc5ca1"} +# HEAD of osa "stable/queens" as of 06.06.2018 +export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"5dbc4c5b67e67c370b04099c7dce56dd2f559288"} 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') diff --git a/xci/installer/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml index f631c839..b000bce4 100644 --- a/xci/installer/osa/files/ansible-role-requirements.yml +++ b/xci/installer/osa/files/ansible-role-requirements.yml @@ -120,7 +120,8 @@ - name: os_nova scm: git src: https://github.com/openstack/openstack-ansible-os_nova - version: 8c6a1b572e334bf185bf23759b90089a88a88b4b + version: d104fb16bdc349382fd05265ff9e19b6b0133fac + refspec: refs/changes/17/572417/1 - name: os_octavia scm: git src: https://github.com/openstack/openstack-ansible-os_octavia @@ -152,7 +153,7 @@ - name: plugins scm: git src: https://github.com/openstack/openstack-ansible-plugins - version: 2472c81eb3b065a7ed7dc4fd6bc4fef3f171089c + version: e1f330786d5f09bb02c3f06b3484a089223419ad - name: rabbitmq_server scm: git src: https://github.com/openstack/openstack-ansible-rabbitmq_server @@ -160,7 +161,7 @@ - name: repo_build scm: git src: https://github.com/openstack/openstack-ansible-repo_build - version: ec5210e812e48dac30eca4c188a9d159c5cdacbf + version: a84d11ab04c911c788b534cd61d33e6e2b71dd0b - name: repo_server scm: git src: https://github.com/openstack/openstack-ansible-repo_server -- cgit 1.2.3-korg