summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorJulie Pichon <jpichon@redhat.com>2018-09-14 09:59:32 +0100
committerJulie Pichon <jpichon@redhat.com>2018-09-14 10:23:14 +0100
commit1b66ad9067cc404ebfdc8569822d226d5bffddd6 (patch)
treed3c1a3fffa6ffa43f7ceb81fad2e8fff4e84406b /openstackclient/common
parent53c99a21fdabce3a0ff89daa0dc9a6fc8bdb9ace (diff)
downloadpython-openstackclient-1b66ad9067cc404ebfdc8569822d226d5bffddd6.tar.gz
Fix 'project purge' deleting wrong project's servers and volumes
Project purge would delete the servers and volumes for the project the user is currently authenticated for, regardless of the --project flag. Note: This change means that no server at all will be deleted if the logged in user doesn't have the get_all_tenants permission set in the Nova policy (default: admin_api). This doesn't appear to be an issue with Cinder as the default rule appears to be admin_or_owner. Change-Id: If1c54e24e1482438b81c3c32fd5fc9fdd7a7be04 Story: 1747988 Task: 13854
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/project_purge.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/common/project_purge.py b/openstackclient/common/project_purge.py
index 5b1d0072..76ed4563 100644
--- a/openstackclient/common/project_purge.py
+++ b/openstackclient/common/project_purge.py
@@ -85,7 +85,7 @@ class ProjectPurge(command.Command):
# servers
try:
compute_client = self.app.client_manager.compute
- search_opts = {'tenant_id': project_id}
+ search_opts = {'tenant_id': project_id, 'all_tenants': True}
data = compute_client.servers.list(search_opts=search_opts)
self.delete_objects(
compute_client.servers.delete, data, 'server', dry_run)
@@ -110,7 +110,7 @@ class ProjectPurge(command.Command):
# volumes, snapshots, backups
volume_client = self.app.client_manager.volume
- search_opts = {'project_id': project_id}
+ search_opts = {'project_id': project_id, 'all_tenants': True}
try:
data = volume_client.volume_snapshots.list(search_opts=search_opts)
self.delete_objects(