Use heat devstack plugin

Now that heat is available as a devstack plugin, we should
use it. In-tree devstack code for heat is planned to be
removed soon[1].

And also, this patch remove `update_heat_policy` function
in devstack plugin. Because fetching global stack list is
already option to use in Magnum.

[1] https://review.openstack.org/#/c/317618/

Change-Id: Iab675da5ea8d02b3f7e71f6169c81724a0066858
Co-Authored-By: OTSUKA, Yuanying <yuanying@fraction.​jp>

devstack/README.rst

@@ -17,6 +17,7 @@ magnum plugin::
 
      cat > /opt/stack/devstack/local.conf << END
      [[local|localrc]]
+     enable_plugin heat https://github.com/openstack/heat master
      enable_plugin magnum https://github.com/openstack/magnum master
      END
 

devstack/lib/magnum

@@ -97,8 +97,6 @@ function configure_magnum {
     create_magnum_conf
 
     create_api_paste_conf
-
-    update_heat_policy
 }
 
 # create_magnum_accounts() - Set up common required magnum accounts
@@ -224,12 +222,6 @@ function create_api_paste_conf {
     cp $MAGNUM_DIR/etc/magnum/api-paste.ini $MAGNUM_API_PASTE
 }
 
-function update_heat_policy {
-    # enable stacks global_index search so that magnum can use
-    # list(global_tenant=True)
-    sed -i 's/\("stacks:global_index":\).*$/\1 "rule:context_is_admin",/' $HEAT_CONF_DIR/policy.json
-}
-
 # create_magnum_cache_dir() - Part of the init_magnum() process
 function create_magnum_cache_dir {
     # Create cache dir

devstack/settings

@@ -24,12 +24,6 @@ enable_service q-l3
 enable_service q-meta
 enable_service neutron
 
-# Enable Heat services
-enable_service h-eng
-enable_service h-api
-enable_service h-api-cfn
-enable_service h-api-cw
-
 # Disable LBaaS(v1) service
 disable_service q-lbaas
 # Enable LBaaS(v2) services

doc/source/dev/manual-devstack.rst

@@ -65,12 +65,8 @@ and neutron::
     enable_service o-hm
     enable_service o-api
 
-    # Enable heat services
+    # Enable heat plugin
-    enable_service h-eng
+    enable_plugin heat https://git.openstack.org/openstack/heat
-    enable_service h-api
-    enable_service h-api-cfn
-    enable_service h-api-cw
-
     # Enable barbican services
     enable_plugin barbican https://git.openstack.org/openstack/barbican
     enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas
@@ -81,6 +77,7 @@ and neutron::
 
 **NOTE:** Update PUBLIC_INTERFACE and other parameters as appropriate for
 your system.
+**NOTE:** Enable heat plugin is necessary.
 
 More devstack configuration information can be found at
 http://docs.openstack.org/developer/devstack/configuration.html

doc/source/dev/quickstart.rst

@@ -108,7 +108,7 @@ Clone devstack::
 
 We will run devstack with minimal local.conf settings required to enable
 magnum, heat, and neutron (neutron is enabled by default in devstack since
-Kilo, and heat is enabled by the magnum plugin)::
+Kilo, and heat must be enabled by yourself)::
 
     cat > /opt/stack/devstack/local.conf << END
     [[local|localrc]]
@@ -123,6 +123,7 @@ Kilo, and heat is enabled by the magnum plugin)::
     # Enable barbican service and use it to store TLS certificates
     # For details http://docs.openstack.org/developer/magnum/dev/tls.html
     enable_plugin barbican https://git.openstack.org/openstack/barbican
+    enable_plugin heat https://git.openstack.org/openstack/heat
     enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas
     enable_plugin octavia https://git.openstack.org/openstack/octavia
 
@@ -139,6 +140,7 @@ Kilo, and heat is enabled by the magnum plugin)::
     END
 
 **NOTE:** Update PUBLIC_INTERFACE as appropriate for your system.
+**NOTE:** Enable heat plugin is necessary.
 
 Optionally, you can enable ceilometer in devstack. If ceilometer is enabled,
 magnum will periodically send metrics to ceilometer::
@@ -727,4 +729,3 @@ creates a virtual environment to run in.
 When complete, the documentation can be accessed from::
 
     doc/build/html/index.html
-

magnum/tests/contrib/gate_hook.sh

@@ -19,7 +19,8 @@ coe=$1
 special=$2
 
 export PROJECTS="openstack/barbican $PROJECTS"
-export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum"
+export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
 
 if [ "${coe}${special}" != "k8s-ironic" ]; then