[CI] Drop test config workaround in standalone jobs
devstack seems to honor local.conf's test-config
properly now, and this workaround is no longer
necessary.
Change-Id: I4f52a9f2a7a2ca12083c47766615ec2e8fdd4a49
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
diff --git a/playbooks/manila-tempest-plugin-standalone/run.yaml b/playbooks/manila-tempest-plugin-standalone/run.yaml
index 8df9205..26ad69a 100644
--- a/playbooks/manila-tempest-plugin-standalone/run.yaml
+++ b/playbooks/manila-tempest-plugin-standalone/run.yaml
@@ -5,7 +5,6 @@
- hosts: tempest
roles:
- setup-tempest-run-dir
- - set-tempest-config
- setup-tempest-data-dir
- acl-devstack-files
- run-tempest
diff --git a/roles/set-tempest-config/README.rst b/roles/set-tempest-config/README.rst
deleted file mode 100644
index 9402d3c..0000000
--- a/roles/set-tempest-config/README.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-set-tempest-config
-==================
-
-This is a workaround for the `merge_config_file <https://opendev
-.org/openstack/devstack/src/commit/76d7d7c90c3979c72404fddd31ee884c8bfdb1ec
-/inc/meta-config#L82>`_ routine that doesn't working correctly on jobs based on
-the "devstack-minimal" profile.
-
-**Role Variables**
-
-.. zuul:rolevar:: devstack_base_dir
- :default: /opt/stack
-
- The devstack base directory.
-
-.. zuul:rolevar:: devstack_local_conf_path
- :default: "{{ devstack_base_dir }}/devstack/local.conf"
-
- Where to find the local.conf file
diff --git a/roles/set-tempest-config/defaults/main.yml b/roles/set-tempest-config/defaults/main.yml
deleted file mode 100644
index 5cc7ca6..0000000
--- a/roles/set-tempest-config/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-devstack_base_dir: /opt/stack
-devstack_local_conf_path: "{{ devstack_base_dir }}/devstack/local.conf"
diff --git a/roles/set-tempest-config/tasks/main.yml b/roles/set-tempest-config/tasks/main.yml
deleted file mode 100644
index 3572ff5..0000000
--- a/roles/set-tempest-config/tasks/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- name: Install required pip packages
- pip:
- name: devstack-tools
- state: "latest"
- virtualenv: /var/tmp/venv
-
-- name: Copy tempest config
- shell: >-
- . /var/tmp/venv/bin/activate && \
- dsconf extract {{ devstack_local_conf_path }} \
- test-config \
- '$TEMPEST_CONFIG' \
- {{ devstack_base_dir }}/tempest/etc/tempest.conf
- become: yes