From 6eab982dadfcf9730b449ece38e0cd96c1d63877 Mon Sep 17 00:00:00 2001 From: Ryan Brown Date: Mon, 21 Jul 2014 11:02:17 -0400 Subject: [PATCH] Remove rst2script.sed and integration.sh rst2script.sed was referenced in the Fedora getting started documentation, but the recommended way to use Heat/Openstack on Fedora is now to use RDO/packstack. Also removes the reference to rst2script.sed in the getting_started/on_fedora documentation. Also removes obsolete integration.sh script. Partial-Bug: 1338066 Change-Id: I7f2b0d84ccef324ccb8e32ca4c6d90f9a3f2dda3 --- doc/source/getting_started/on_fedora.rst | 13 +--- tools/integration.sh | 26 -------- tools/rst2script.sed | 38 ------------ tools/uninstall-heat | 79 ------------------------ 4 files changed, 3 insertions(+), 153 deletions(-) delete mode 100755 tools/integration.sh delete mode 100755 tools/rst2script.sed delete mode 100755 tools/uninstall-heat diff --git a/doc/source/getting_started/on_fedora.rst b/doc/source/getting_started/on_fedora.rst index f768ec48b6..d7c3efbeba 100644 --- a/doc/source/getting_started/on_fedora.rst +++ b/doc/source/getting_started/on_fedora.rst @@ -14,19 +14,12 @@ Getting Started With Heat on Fedora =================================== -.. - This file is a ReStructuredText document, but can be converted to a script - using the accompanying rst2script.sed script. Any blocks that are indented by - 4 spaces (including comment blocks) will appear in the script. To document - code that should not appear in the script, use an indent of less than 4 - spaces. (Using a Quoted instead of Indented Literal block also works.) - To include code in the script that should not appear in the output, make it - a comment block. - Installing OpenStack and Heat on Fedora --------------------------------------- -Either the Grizzly, or Havana release of OpenStack is required. If you are using Grizzly, you should use the stable/grizzly branch of Heat. +Heat requires an Openstack release of Grizzly or newer, but bear in mind that Grizzly is EOL. The current stable release_ is, of course, recommended. + +.. _release: https://wiki.openstack.org/wiki/Releases Instructions for installing the RDO OpenStack distribution on Fedora are available at ``http://openstack.redhat.com/Quickstart`` diff --git a/tools/integration.sh b/tools/integration.sh deleted file mode 100755 index 30af370014..0000000000 --- a/tools/integration.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -TOOLS_DIR=`dirname $0` -HEAT_DIR="$TOOLS_DIR/.." - -clean() { - $TOOLS_DIR/uninstall-heat -y -r "" -} - -error() { - echo "Failed :(" -} - -run() { - bash -c "$($TOOLS_DIR/rst2script.sed $HEAT_DIR/doc/source/getting_started/on_fedora.rst)" || error -} - -case $1 in - clean|run) - $1 - ;; - *) - clean - run - ;; -esac diff --git a/tools/rst2script.sed b/tools/rst2script.sed deleted file mode 100755 index d34bab7aad..0000000000 --- a/tools/rst2script.sed +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sed -nrf - -# Skip over the ".." line that starts a comment block. -/^\.{2}[[:space:]]*$/ n - -# Loop through the block until a non-indented line is found. -# Append indented lines to the hold space. -: indent -/^ {4}/ { - s/^ {4}// - H - $ b endblock - n - b indent -} - -# Loop through to the end of the block. -# Clear the hold space if unindented lines are present. -:nonindent -/^[[:space:]]*$/! { - x - s/.*// - x - $ d - n - b nonindent -} - -# Print the contents of the hold space (if any) and clear it. -: endblock -s/.*// -x -s/^\n// -/./ { -p -a \ - -} diff --git a/tools/uninstall-heat b/tools/uninstall-heat deleted file mode 100755 index 6f07349f1f..0000000000 --- a/tools/uninstall-heat +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -TOOLS_DIR=`dirname $0` -if [ "$1" = "-y" ] || [ "$1" = "--yes" ]; then - SKIP_ASK=y - shift -fi - -user_wants() { - if [ "$SKIP_ASK" = "y" ]; then return 0; fi - - while true; do - read -n 1 -p "$1 " cont - echo 1>&2 - case $cont in - y|Y) - return 0 - ;; - n|N) - return 1 - ;; - *) - ;; - esac - done -} - -HEAT_PIDS=`pgrep '^heat-(api|api-cfn|engine|metadata)$'` -if [ -n "$HEAT_PIDS" ]; then - echo 'The following Heat processes are running:' 1>&2 - ps $HEAT_PIDS 1>&2 - if user_wants 'Kill them?'; then - sudo kill $HEAT_PIDS - fi - echo 1>&2 -fi - -if user_wants 'Drop Heat database tables?'; then - $TOOLS_DIR/heat-db-drop $* - echo 1>&2 -fi - -if user_wants 'Erase OpenStack installation?'; then - $TOOLS_DIR/openstack erase $* - echo 1>&2 -fi - -HEAT_EGGS=`python -c 'import sys; print "\n".join(sys.path)' | grep '/heat-[^/]*\.egg$'` -if [ -n "$HEAT_EGGS" ]; then - echo 'The following Heat installations were found:' 1>&2 - echo "$HEAT_EGGS" 1>&2 - if user_wants 'Delete them?'; then - sudo rm -rf $HEAT_EGGS - fi - echo 1>&2 -fi - -if user_wants 'Delete Heat binaries?'; then - BIN_PATH=/usr/bin - sudo rm -f $BIN_PATH/heat-db-setup - sudo rm -f $BIN_PATH/heat-metadata - sudo rm -f $BIN_PATH/heat-api - sudo rm -f $BIN_PATH/heat-api-cfn - sudo rm -f $BIN_PATH/heat-engine - - echo 1>&2 -fi - -if user_wants 'Delete Heat configuration?'; then - sudo rm -rf /etc/heat - echo 1>&2 -fi - -if user_wants 'Delete Heat logs?'; then - sudo rm -rf /var/log/heat - echo 1>&2 -fi - -echo 'Warning: You shall explicitly remove related tenants, role, and users from keystone' 1>&2