@@ -609,29 +609,6 @@ act as a S3 endpoint for Keystone so effectively replacing the

 Only Swift proxy server is launched in the systemd system all other

 services are started in background and managed by ``swift-init`` tool.

-Heat

-~~~~

-

-Heat is disabled by default (see ``stackrc`` file). To enable it

-explicitly you'll need the following settings in your ``localrc``

-section

-

-::

-

-    enable_service heat h-api h-api-cfn h-api-cw h-eng

-

-Heat can also run in standalone mode, and be configured to orchestrate

-on an external OpenStack cloud. To launch only Heat in standalone mode

-you'll need the following settings in your ``localrc`` section

-

-::

-

-    disable_all_services

-    enable_service rabbit mysql heat h-api h-api-cfn h-api-cw h-eng

-    HEAT_STANDALONE=True

-    KEYSTONE_SERVICE_HOST=...

-    KEYSTONE_AUTH_HOST=...

-

 Tempest

 ~~~~~~~

@@ -159,16 +159,6 @@ to a working IP address; setting it to 127.0.0.1 in ``/etc/hosts`` is

 often good enough for a single-node installation. And in an extreme

 case, use ``clean.sh`` to eradicate it and try again.

-Configure ``local.conf`` thusly:

-

-    ::

-

-        [[local|localrc]]

-        HEAT_STANDALONE=True

-        ENABLED_SERVICES=rabbit,mysql,heat,h-api,h-api-cfn,h-api-cw,h-eng

-        KEYSTONE_SERVICE_HOST=<keystone-host>

-        KEYSTONE_AUTH_HOST=<keystone-host>

-

 Why are my configuration changes ignored?

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -64,8 +64,7 @@ Services

 The default services configured by DevStack are Identity (keystone),

 Object Storage (swift), Image Service (glance), Block Storage

-(cinder), Compute (nova), Networking (neutron), Dashboard (horizon),

-Orchestration (heat)

+(cinder), Compute (nova), Networking (neutron), Dashboard (horizon)

 Additional services not included directly in DevStack can be tied in to

 ``stack.sh`` using the :doc:`plugin mechanism <plugins>` to call

@@ -394,24 +394,6 @@ function configure_tempest {

     iniset $TEMPEST_CONFIG network-feature-enabled ipv6_subnet_attributes "$IPV6_SUBNET_ATTRIBUTES_ENABLED"

     iniset $TEMPEST_CONFIG network-feature-enabled port_security $NEUTRON_PORT_SECURITY

-    # Orchestration Tests

-    if is_service_enabled heat; then

-        if [[ ! -z "$HEAT_CFN_IMAGE_URL" ]]; then

-            iniset $TEMPEST_CONFIG orchestration image_ref $(basename "${HEAT_CFN_IMAGE_URL%.*}")

-        fi

-        # Nova might not be enabled, especially when we want to test tempest scenario/API that only create Neutron resources

-        if is_service_enabled nova; then

-            # build a specialized heat flavor

-            available_flavors=$(nova flavor-list)

-            if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then

-                openstack flavor create --id 451 --ram 512 --disk 0 --vcpus 1 m1.heat

-            fi

-            iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"

-        fi

-        iniset $TEMPEST_CONFIG orchestration build_timeout 900

-        iniset $TEMPEST_CONFIG orchestration stack_owner_role Member

-    fi

-

     # Scenario

     if [ "$VIRT_DRIVER" = "xenserver" ]; then

         SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}

@@ -2,7 +2,7 @@

 # ``stack.sh`` is an opinionated OpenStack developer installation.  It

 # installs and configures various combinations of **Cinder**, **Glance**,

-# **Heat**, **Horizon**, **Keystone**, **Nova**, **Neutron**, and **Swift**

+# **Horizon**, **Keystone**, **Nova**, **Neutron**, and **Swift**

 # This script's options can be changed by setting appropriate environment

 # variables.  You can configure things like which git repositories to use,

@@ -1328,10 +1328,6 @@ if is_service_enabled nova && is_service_enabled keystone; then

         USERRC_PARAMS="$USERRC_PARAMS --os-cacert $SSL_BUNDLE_FILE"

     fi

-    if [[ "$HEAT_STANDALONE" = "True" ]]; then

-        USERRC_PARAMS="$USERRC_PARAMS --heat-url http://$HEAT_API_HOST:$HEAT_API_PORT/v1"

-    fi

-

     $TOP_DIR/tools/create_userrc.sh $USERRC_PARAMS

 fi

@@ -518,14 +518,6 @@ GITBRANCH["cursive"]=${CURSIVE_BRANCH:-master}

 GITREPO["glance_store"]=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}

 GITBRANCH["glance_store"]=${GLANCE_STORE_BRANCH:-master}

-# heat-cfntools server agent

-HEAT_CFNTOOLS_REPO=${HEAT_CFNTOOLS_REPO:-${GIT_BASE}/openstack/heat-cfntools.git}

-HEAT_CFNTOOLS_BRANCH=${HEAT_CFNTOOLS_BRANCH:-master}

-

-# heat example templates and elements

-HEAT_TEMPLATES_REPO=${HEAT_TEMPLATES_REPO:-${GIT_BASE}/openstack/heat-templates.git}

-HEAT_TEMPLATES_BRANCH=${HEAT_TEMPLATES_BRANCH:-master}

-

 # django openstack_auth library

 GITREPO["django_openstack_auth"]=${HORIZONAUTH_REPO:-${GIT_BASE}/openstack/django_openstack_auth.git}

 GITBRANCH["django_openstack_auth"]=${HORIZONAUTH_BRANCH:-master}