From 8e35c6fe4ea97c6be6e3266f5c12cae047c61105 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Fri, 19 Oct 2018 19:01:03 +0100 Subject: [PATCH] Fix genpolicy tox job The etc/placement/policy-generator.conf file still referred to nova. Now that it does not, policy generation happens as expected. The name of the generated file has been changed to policy.yaml.sample, as we no longer need to distinguish from nova's. Note that the readme still points to nova docs, because that is where we currently have the docs. This will need to change later. Change-Id: I633431933666c15eaf8da7e91769d0b4335e6c8d --- etc/placement/README-policy.yaml.txt | 15 +-------------- etc/placement/policy-generator.conf | 4 +--- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/etc/placement/README-policy.yaml.txt b/etc/placement/README-policy.yaml.txt index a975e13bf..a4dcab683 100644 --- a/etc/placement/README-policy.yaml.txt +++ b/etc/placement/README-policy.yaml.txt @@ -1,23 +1,10 @@ -Nova -==== - -To generate the sample nova policy.yaml file, run the following command from -the top level of the nova directory: - - tox -egenpolicy - -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 + tox -e genpolicy For a pre-generated example of the latest placement policy.yaml, see: diff --git a/etc/placement/policy-generator.conf b/etc/placement/policy-generator.conf index a2e0697d0..14fe4a373 100644 --- a/etc/placement/policy-generator.conf +++ b/etc/placement/policy-generator.conf @@ -1,5 +1,3 @@ [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 +output_file = etc/placement/policy.yaml.sample namespace = placement