From 5ff28550bee232d2555a980209a388589b1885fc Mon Sep 17 00:00:00 2001 From: Eli Qiao Date: Thu, 2 Jul 2015 16:59:41 +0800 Subject: [PATCH] Update heat policy.json This patch sets stacks:global_index to role:admin in /etc/heat/policy.json, so that an admin role can look for all stacks in heat, which a magnum periodic task will be benefited from it. Partial-Implements: blueprint add-periodic-task Change-Id: I4669ef355d302607f42df182bba680dc548e9618 --- devstack/lib/magnum | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/devstack/lib/magnum b/devstack/lib/magnum index 05f4053f2d..ac2256304f 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -88,6 +88,7 @@ function configure_magnum { # Rebuild the config file from scratch create_magnum_conf + update_heat_policy } # create_magnum_accounts() - Set up common required magnum accounts @@ -169,6 +170,12 @@ function create_magnum_conf { fi } +function update_heat_policy { + # enable stacks globel_index search so that magnum can use + # list(global_tenant=True) + sed 's/\("stacks:global_index":\).*$/\1 "role:admin",/' $HEAT_CONF_DIR/policy.json +} + function create_magnum_conf_magnum_network { iniset $MAGNUM_CONF DEFAULT network_manager "magnum.network.manager.$NETWORK_MANAGER" iniset $MAGNUM_CONF DEFAULT public_interface "$PUBLIC_INTERFACE"