From e423bcf389c1cf25d9180b77f63647e32aa9fc12 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Fri, 13 Mar 2020 18:22:01 +0530 Subject: [PATCH] Fixed libvirt volume path for nova-migration-target-container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Depends-On: https://review.opendev.org/#/c/711599/ Co-Authored-By: Cédric Jeanneret (Tengu) Change-Id: I2af6587fbfa659eb46b712d63b998e039189d31f Signed-off-by: Chandan Kumar (raukadah) Signed-off-by: Cédric Jeanneret --- .../nova-migration-target-container-puppet.yaml | 17 ++++++++++++++++- zuul.d/layout.yaml | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index 5e3ff91008..b22eb893d4 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-container-puppet.yaml @@ -144,6 +144,21 @@ outputs: dest: /etc/ssh/ owner: "root" perm: "0600" + host_prep_tasks: + # Let's use loop here even for one item, maybe we'll need some more + # directories later. + - name: Create libvirt persistent data directories + file: + path: "{{ item.path }}" + state: directory + setype: "{{ item.setype }}" + loop: + - { 'path': /var/run/libvirt, 'setype': virt_var_run_t } + - name: ensure /var/run/libvirt is present upon reboot + copy: + dest: /etc/tmpfiles.d/var-run-libvirt.conf + content: | + d /var/run/libvirt 0755 root root - - docker_config: step_4: nova_migration_target: @@ -161,7 +176,7 @@ outputs: - /var/lib/kolla/config_files/nova-migration-target.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro - /etc/ssh/:/host-ssh/:ro - - /run/libvirt:/run/libvirt + - /var/run/libvirt:/var/run/libvirt:shared,z # podman fails to relable if nova_nfs_enabled where we have # the nfs share mounted to /var/lib/nova/instances - diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index e06b28bcb1..7d97180932 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -84,7 +84,7 @@ dependencies: *deps_unit_lint - tripleo-ci-centos-8-scenario004-standalone: dependencies: *deps_unit_lint - - tripleo-ci-centos-7-scenario012-standalone: + - tripleo-ci-centos-8-scenario012-standalone: dependencies: *deps_unit_lint - tripleo-ci-centos-7-containerized-undercloud-upgrades: dependencies: *deps_unit_lint