Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/298333

Change subject: Allow projectadmins (on the commandline) to specify labvirt 
hosts.
......................................................................

Allow projectadmins (on the commandline) to specify labvirt hosts.

This permits, for example, something like this:

openstack server create --flavor 2 \
          --image 94726527-e6c2-4ec0-ae98-aff5e37c135c \
          --availability-zone host:labvirt1012 util-abogott

Change-Id: I734e3b19298165aff67ce7ce896ce36ee64e399c
---
M modules/openstack/files/kilo/nova/policy.json
M modules/openstack/files/liberty/nova/policy.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/298333/1

diff --git a/modules/openstack/files/kilo/nova/policy.json 
b/modules/openstack/files/kilo/nova/policy.json
index 1f7dd51..5c6cc69 100644
--- a/modules/openstack/files/kilo/nova/policy.json
+++ b/modules/openstack/files/kilo/nova/policy.json
@@ -9,7 +9,7 @@
     "compute:create": "rule:admin_or_projectadmin",
     "compute:create:attach_network": "rule:admin_or_projectadmin",
     "compute:create:attach_volume": "rule:admin_or_projectadmin",
-    "compute:create:forced_host": "is_admin:True",
+    "compute:create:forced_host": "rule:admin_or_projectadmin",
     "compute:get": "rule:admin_or_member",
     "compute:get_all": "",
     "compute:get_all_tenants": "",
diff --git a/modules/openstack/files/liberty/nova/policy.json 
b/modules/openstack/files/liberty/nova/policy.json
index 0edde8d..5b6197e 100644
--- a/modules/openstack/files/liberty/nova/policy.json
+++ b/modules/openstack/files/liberty/nova/policy.json
@@ -9,7 +9,7 @@
     "compute:create": "rule:admin_or_projectadmin",
     "compute:create:attach_network": "rule:admin_or_projectadmin",
     "compute:create:attach_volume": "rule:admin_or_projectadmin",
-    "compute:create:forced_host": "is_admin:True",
+    "compute:create:forced_host": "rule:admin_or_projectadmin",
     "compute:get": "rule:admin_or_member",
     "compute:get_all": "",
     "compute:get_all_tenants": "",

-- 
To view, visit https://gerrit.wikimedia.org/r/298333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I734e3b19298165aff67ce7ce896ce36ee64e399c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to