Fix ansible-sshd version
The role ansible-sshd has removed existing tags and replaced them with equivalents in a different format, e.g. 0.4.5 with v0.4.5, [1]. This is causing a failure when attempting to install the role defined in this repository. [1] https://github.com/willshersystems/ansible-sshd/issues/98 In order to help get this through the gate, we also disable nested virt when in OpenStack-CI due to issues at some providers, as was done in Ifae3425b66254aa655df5b6bb95896da1cccc32a and we ensure that tests in OpenStack-CI make use of the reverse proxy, as was done in Id6982945509a174b0aaa74ccbdfa45adc5cfbb7a Depends-On: https://review.openstack.org/619695 Depends-On: https://review.openstack.org/619691 Change-Id: Id02f3dfbe29cf4ddbe2f3a1f366d2a917b3960b7
This commit is contained in:
parent
49d09e6a31
commit
acff6f2d1f
|
@ -13,11 +13,11 @@
|
|||
- name: galera_client
|
||||
scm: git
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-galera_client
|
||||
version: eefbc89ea59a54a033dfd8b8c4c3e3dcd1b67803
|
||||
version: 498e22742c0b0947811559cdba3ab8aebc0b061c
|
||||
- name: galera_server
|
||||
scm: git
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-galera_server
|
||||
version: de9a29faa9b87094c06d59ec9e29eb2059b07d8d
|
||||
version: 6413e57c0b23a8c0e630d35638e991d984cbf24f
|
||||
- name: ceph_client
|
||||
scm: git
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
|
||||
|
@ -161,7 +161,7 @@
|
|||
- name: sshd
|
||||
scm: git
|
||||
src: https://github.com/willshersystems/ansible-sshd
|
||||
version: 0.5.1
|
||||
version: v0.5.1
|
||||
- name: bird
|
||||
scm: git
|
||||
src: https://github.com/logan2211/ansible-bird
|
||||
|
|
|
@ -66,19 +66,14 @@
|
|||
when:
|
||||
- nodepool_dir.stat.exists
|
||||
block:
|
||||
# OVH nodepool nodes have an issue which causes nested virt
|
||||
# instances to crash with a hardware error, then a dump.
|
||||
# We therefore detect whether we're running on OVH and
|
||||
# force it to use qemu instead.
|
||||
- name: Discover the OpenStack-Infra mirrors
|
||||
shell: |
|
||||
source /etc/ci/mirror_info.sh
|
||||
NODEPOOL_OVERRIDES="/etc/openstack_deploy/user_openstackci.yml"
|
||||
echo "uca_apt_repo_url: '${NODEPOOL_UCA_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
|
||||
echo "openstack_hosts_centos_mirror_url: '${NODEPOOL_CENTOS_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
|
||||
if [[ ${NODEPOOL_PYPI_MIRROR} == *.ovh.* ]]; then
|
||||
echo "nova_virt_type: 'qemu'" >> ${NODEPOOL_OVERRIDES}
|
||||
fi
|
||||
echo "galera_repo_host: '${NODEPOOL_MIRROR_HOST}:8080'" >> ${NODEPOOL_OVERRIDES}
|
||||
echo "nova_virt_type: 'qemu'" >> ${NODEPOOL_OVERRIDES}
|
||||
echo "repo_build_pip_default_index: '${NODEPOOL_PYPI_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
|
||||
args:
|
||||
executable: /bin/bash
|
||||
|
|
Loading…
Reference in New Issue