From d549afe6aed1ff34c904febf63ef1d2b6c081d61 Mon Sep 17 00:00:00 2001 From: phil-hopkins-a Date: Thu, 17 Nov 2016 13:41:33 -0600 Subject: [PATCH] Removing the setting of the nova policy line Due to the removal of the nova policy.json file, everthing is failing the dsvm gate. This should fix the until devstack addresses the recent nova change. Change-Id: I69681dbb9cc9dcbe02e2e5514d999747b7efeae3 Fixes-Bug: 1642713 --- astara/api/nova.py | 1 + devstack/plugin.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/astara/api/nova.py b/astara/api/nova.py index b98c64fc..4db396c8 100644 --- a/astara/api/nova.py +++ b/astara/api/nova.py @@ -225,6 +225,7 @@ class OnDemandInstanceProvider(InstanceProvider): return instance_info + INSTANCE_PROVIDERS = { 'on_demand': OnDemandInstanceProvider, 'pez': PezInstanceProvider, diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f9e9dc4a..a17899f8 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -259,7 +259,7 @@ function set_neutron_user_permission() { # public networks, we need to modify the policy and allow users with the service # to do that too. - policy_add "$NOVA_CONF_DIR/policy.json" "network:attach_external_network" "\"rule:admin_api or role:service\"" + #policy_add "$NOVA_CONF_DIR/policy.json" "network:attach_external_network" "\"rule:admin_api or role:service\"" }