diff options
| author | Sean Dague <sean@dague.net> | 2016-06-22 16:37:38 -0400 |
|---|---|---|
| committer | Sean Dague <sean@dague.net> | 2016-06-24 14:32:23 -0400 |
| commit | f26739394f551ed50144d5d52419e15b1f5c04da (patch) | |
| tree | f2a9c1533c1e9ac2d5d757799f2c950c39a204b3 /nova/policies | |
| parent | 600480e59dca08490459c5b9608dabf5c1146b24 (diff) | |
| download | nova-f26739394f551ed50144d5d52419e15b1f5c04da.tar.gz | |
remove preserve-ephemeral rebuild extension
This folds this back into the main rebuild flow. As there were no unit
tests for this, doing so was pretty simple.
Part of bp:api-no-more-extensions
Change-Id: I19f791ed5af917b5509940765fedc1b944fcf315
Diffstat (limited to 'nova/policies')
| -rw-r--r-- | nova/policies/__init__.py | 2 | ||||
| -rw-r--r-- | nova/policies/preserve_ephemeral_rebuild.py | 32 |
2 files changed, 0 insertions, 34 deletions
diff --git a/nova/policies/__init__.py b/nova/policies/__init__.py index 21d46cfe1d..17f12be841 100644 --- a/nova/policies/__init__.py +++ b/nova/policies/__init__.py @@ -69,7 +69,6 @@ from nova.policies import networks_associate from nova.policies import pause_server from nova.policies import pci from nova.policies import personality -from nova.policies import preserve_ephemeral_rebuild from nova.policies import quota_class_sets from nova.policies import quota_sets from nova.policies import remote_consoles @@ -156,7 +155,6 @@ def list_rules(): pause_server.list_rules(), pci.list_rules(), personality.list_rules(), - preserve_ephemeral_rebuild.list_rules(), quota_class_sets.list_rules(), quota_sets.list_rules(), remote_consoles.list_rules(), diff --git a/nova/policies/preserve_ephemeral_rebuild.py b/nova/policies/preserve_ephemeral_rebuild.py deleted file mode 100644 index c0d842b7b8..0000000000 --- a/nova/policies/preserve_ephemeral_rebuild.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2016 Cloudbase Solutions Srl -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_policy import policy - -from nova.policies import base - - -POLICY_ROOT = 'os_compute_api:os-preserve-ephemeral-rebuild:%s' - - -preserve_ephemeral_rebuild_policies = [ - policy.RuleDefault( - name=POLICY_ROOT % 'discoverable', - check_str=base.RULE_ANY), -] - - -def list_rules(): - return preserve_ephemeral_rebuild_policies |