Merge "Drop setup.py and setup.cfg"
diff --git a/.zuul.yaml b/.zuul.yaml
index 067d3f5..0dda262 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -849,7 +849,6 @@
- devstack-platform-centos-8-stream
- devstack-platform-centos-9-stream
- devstack-platform-debian-bullseye
- - devstack-platform-openEuler-20.03-SP2
- devstack-multinode
- devstack-unit-tests
- openstack-tox-bashate
@@ -948,6 +947,7 @@
experimental:
jobs:
+ - devstack-platform-openEuler-20.03-SP2
- nova-multi-cell
- nova-next
- neutron-fullstack-with-uwsgi
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"
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:
diff --git a/stackrc b/stackrc
index e48fd81..d22fa88 100644
--- a/stackrc
+++ b/stackrc
@@ -235,7 +235,7 @@
# Setting the variable to 'ALL' will activate the download for all
# libraries.
-DEVSTACK_SERIES="yoga"
+DEVSTACK_SERIES="zed"
##############
#