diff options
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/pinned-versions | 10 | ||||
| -rwxr-xr-x | xci/config/user-vars | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 304c192a..5d5908e7 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -26,7 +26,7 @@ # use releng-xci from master until the development work with the sandbox is complete export OPNFV_RELENG_VERSION="master" # HEAD of bifrost "master" as of 13.02.2018 -export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"f3cf0d9fff6ec08ba0e46cbde5bfebfd77a26752"} +export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"28b6b8c96f89532bbddeca513285e6c00db89205"} # HEAD of ironic "master" as of 13.02.2018 export BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-"9b8440aa318e4883a74ef8640ad5409dd22858a9"} # HEAD of ironic-client "master" as of 13.02.2018 @@ -35,12 +35,14 @@ 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 "master" as of 13.02.2018 -export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"22aa7943c08f6dd3a65fa8ac8d647373e4ba3779"} +# HEAD of osa "stable/queens" as of 02.03.2018 +export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"eee0498dbe21fea565c06c686546c0734c4bb2e3"} 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') export HAPROXY_VERSION=$(grep -E '.*name: haproxy_server' -A 3 \ ${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \ | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p') -export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"master"} +# HEAD of kubspray "master" as of 27.02.2018 +# kubespray's bug Reference: https://github.com/kubernetes-incubator/kubespray/issues/2400 +export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"810c10a0e9b65b0ef8ae8f7c302f7553a165631c"} diff --git a/xci/config/user-vars b/xci/config/user-vars index 49124233..451b6b85 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -45,5 +45,7 @@ export XCI_INSTALLER=${XCI_INSTALLER:-osa} # XCI_ANSIBLE_VERBOSITY="-vvvv" export XCI_ANSIBLE_VERBOSITY=${XCI_ANSIBLE_VERBOSITY:-""} export RUN_TEMPEST=${RUN_TEMPEST:-false} +export CORE_OPENSTACK_INSTALL=${CORE_OPENSTACK_INSTALL:-false} +export BIFROST_USE_PREBUILT_IMAGES=${BIFROST_USE_PREBUILT_IMAGES:-false} # Set this to to true to force XCI to re-create the target OS images export CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false} |