From 53af1f4485e2019f7c7301679e10e8c914e49a89 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Wed, 26 Oct 2016 10:54:05 -0700 Subject: [PATCH] Remove heat as enable_service in devstack 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. Co-Authored-By: zhurong Depends-On: I505a308de751bf8c35b921659e8eeb36cc2fb9a9 Change-Id: I3def7bfb026a15cf0d7a9ee6683b5f8abc1f6c32 --- devstack/README.rst | 5 ++++- devstack/settings | 3 --- .../notes/devstack_using_heat_plugin-3dc9feeed36f24ec.yaml | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/devstack_using_heat_plugin-3dc9feeed36f24ec.yaml diff --git a/devstack/README.rst b/devstack/README.rst index 22daf70e1..48f409a51 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -7,12 +7,15 @@ Enabling in Devstack git clone https://git.openstack.org/openstack-dev/devstack cd devstack -#. Edit ``local.conf`` to enable murano devstack plugin:: +#. Edit ``local.conf`` to enable murano and heat devstack plugin:: > cat local.conf [[local|localrc]] enable_plugin murano git://git.openstack.org/openstack/murano + #Enable heat plugin + enable_plugin heat https://git.openstack.org/openstack/heat + #. If you want Murano Cloud Foundry Broker API service enabled, add the following line to ``local.conf``:: diff --git a/devstack/settings b/devstack/settings index 24c871f1c..ec9e2ae68 100644 --- a/devstack/settings +++ b/devstack/settings @@ -74,6 +74,3 @@ GLARE_ENDPOINT_TYPE=${GLARE_ENDPOINT_TYPE:-publicURL} enable_service murano enable_service murano-api enable_service murano-engine - -# Enable heat orchestration engine and other heat services -enable_service heat h-api h-api-cfn h-api-cw h-eng diff --git a/releasenotes/notes/devstack_using_heat_plugin-3dc9feeed36f24ec.yaml b/releasenotes/notes/devstack_using_heat_plugin-3dc9feeed36f24ec.yaml new file mode 100644 index 000000000..22913b255 --- /dev/null +++ b/releasenotes/notes/devstack_using_heat_plugin-3dc9feeed36f24ec.yaml @@ -0,0 +1,4 @@ +--- +other: + - Since Newton release, heat is available as a devstack plugin. + So we remove heat as enable_service in devstack.