From 338a0603d2072fc21a823766cfcfe8c429ea217c Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Fri, 13 Sep 2019 10:01:00 +0900 Subject: [PATCH] Remove an unused file and a related description The following file should have been removed in I4181f39dea7eb10b84e6f5057938767b3e422aff. * etc/nova/placement-policy-generator.conf A description of generating the placement policy.yaml file should also have been removed in the commit. Therefore remove them. And the 'wsgi-intercept' package is used for OSAPIFixture and not for placement functional tests currently. So a comment is removed in test-requirements.txt. Change-Id: Ie8d0d7085ccd82a47ea27b98be75c1bc9ba6195b --- etc/nova/README-policy.yaml.txt | 13 ------------- etc/nova/placement-policy-generator.conf | 5 ----- test-requirements.txt | 4 +--- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 etc/nova/placement-policy-generator.conf diff --git a/etc/nova/README-policy.yaml.txt b/etc/nova/README-policy.yaml.txt index 7599f8071278..aee7a49f81b5 100644 --- a/etc/nova/README-policy.yaml.txt +++ b/etc/nova/README-policy.yaml.txt @@ -9,16 +9,3 @@ the top level of the nova directory: For a pre-generated example of the latest nova policy.yaml, see: https://docs.openstack.org/nova/latest/configuration/sample-policy.html - - -Placement -========= - -To generate the sample placement policy.yaml file, run the following command -from the top level of the nova directory: - - tox -e genplacementpolicy - -For a pre-generated example of the latest placement policy.yaml, see: - - https://docs.openstack.org/nova/latest/configuration/sample-placement-policy.html diff --git a/etc/nova/placement-policy-generator.conf b/etc/nova/placement-policy-generator.conf deleted file mode 100644 index a2e0697d0004..000000000000 --- a/etc/nova/placement-policy-generator.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -# TODO: When placement is split out of the nova repo, this can change to -# etc/placement/policy.yaml.sample. -output_file = etc/nova/placement-policy.yaml.sample -namespace = placement diff --git a/test-requirements.txt b/test-requirements.txt index 03f220645ec1..c8c8cb1c50c3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -23,9 +23,7 @@ testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT bandit>=1.1.0 # Apache-2.0 gabbi>=1.35.0 # Apache-2.0 +wsgi-intercept>=1.7.0 # MIT License # vmwareapi driver specific dependencies oslo.vmware>=2.17.0 # Apache-2.0 - -# placement functional tests -wsgi-intercept>=1.7.0 # MIT License