commit 0ed70e3f7687ffa62a8a4a38cdad14abdc8c7fa7
author Zuul <zuul@review.opendev.org> Mon Mar 28 13:02:03 2022 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 28 13:02:03 2022 +0000
tree fb1edaf51eea7e1aedc0755aceae0aaa5571c547
parent e79913c65fd20eb153c2fd4ba7a9c604f64b8eb1
parent 189c7ff14222fe365a7376e7ef7171bfb2c74b24

Merge "Update DEVSTACK_SERIES to zed"

lib/nova

diff --git a/lib/nova b/lib/nova
index 509cba6..4c14374 100644
--- a/lib/nova
+++ b/lib/nova
@@ -1045,7 +1045,6 @@
     local old_path=$PATH
     export PATH=$NOVA_BIN_DIR:$PATH
 
-    local api_cell_conf=$NOVA_CONF
     local compute_cell_conf=$NOVA_CONF
 
     run_process n-sch "$NOVA_BIN_DIR/nova-scheduler --config-file $compute_cell_conf"

roles/setup-devstack-cache/tasks/main.yaml

diff --git a/roles/setup-devstack-cache/tasks/main.yaml b/roles/setup-devstack-cache/tasks/main.yaml
index 84f33f0..3adff17 100644
--- a/roles/setup-devstack-cache/tasks/main.yaml
+++ b/roles/setup-devstack-cache/tasks/main.yaml
@@ -2,6 +2,7 @@
   # This uses hard links to avoid using extra space.
   command: "find {{ devstack_cache_dir }}/files -mindepth 1 -maxdepth 1 -exec cp -l {} {{ devstack_base_dir }}/devstack/files/ ;"
   become: true
+  ignore_errors: yes
 
 - name: Set ownership of cached files
   file: