Merge "Fix ci gate failure"
This commit is contained in:
commit
d6200ab131
@ -11,6 +11,8 @@ create_kolla_user: True
|
||||
|
||||
enable_host_ntp: True
|
||||
|
||||
disable_selinux: True
|
||||
|
||||
docker_storage_driver: ""
|
||||
|
||||
debian_pkg_install:
|
||||
|
@ -104,6 +104,15 @@
|
||||
- ansible_os_family == "RedHat"
|
||||
- enable_host_ntp | bool
|
||||
|
||||
- name: Disable selinux
|
||||
selinux:
|
||||
policy: target
|
||||
state: permissive
|
||||
become: true
|
||||
when:
|
||||
- disable_selinux | bool
|
||||
- ansible_os_family == "RedHat"
|
||||
|
||||
- name: Reboot
|
||||
command: reboot -f
|
||||
become: True
|
||||
|
@ -1,12 +1,13 @@
|
||||
stdio_handler = "file"
|
||||
|
||||
{% if kolla_base_distro == "ubuntu" %}
|
||||
{% if kolla_base_distro in ['ubuntu', 'centos', 'oraclelinux']%}
|
||||
# TODO: this workaround need to be fixed in Pike
|
||||
# Ubuntu cloud archive released libvirt-bin version 2.5.0 which runs vms as
|
||||
# libvirt-qemu user. This locks access to nova created files for vms which
|
||||
# have permissions 722 for nova user. We need to force qemu to use this user
|
||||
# libvirt-bin latest version which runs vms as libvirt-qemu user.
|
||||
# This locks access to nova created files for vms which have
|
||||
# permissions 722 for nova user. We need to force qemu to use this user
|
||||
# to be able to access vm files.
|
||||
# see https://bugs.launchpad.net/kolla-ansible/+bug/1668654
|
||||
# see https://bugs.launchpad.net/kolla/+bug/1718541
|
||||
user = "nova"
|
||||
group = "nova"
|
||||
{% endif %}
|
||||
|
@ -126,7 +126,7 @@ function setup_ansible {
|
||||
mkdir /tmp/kolla
|
||||
|
||||
# TODO(SamYaple): Move to virtualenv
|
||||
sudo -H pip install -U "ansible>=2" "docker>=2.0.0" "python-openstackclient" "python-neutronclient" "ara"
|
||||
sudo -H pip install -U "ansible>=2,<2.4" "docker>=2.0.0" "python-openstackclient" "python-neutronclient" "ara"
|
||||
detect_distro
|
||||
|
||||
setup_inventory
|
||||
|
Loading…
x
Reference in New Issue
Block a user