From 2b5c9281adf319d7c8e3e4861f2bf18ebbf9b997 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Thu, 30 Aug 2012 16:23:51 -0700
Subject: [PATCH] Remove more references to ubuntu (for now)

---
 conf/components/horizon.yaml          |  5 ++--
 docs/source/topics/features.rst       |  1 -
 docs/source/topics/solvedproblems.rst | 42 ---------------------------
 smithy                                | 37 -----------------------
 4 files changed, 3 insertions(+), 82 deletions(-)

diff --git a/conf/components/horizon.yaml b/conf/components/horizon.yaml
index 4930d7fe..09d8f6eb 100644
--- a/conf/components/horizon.yaml
+++ b/conf/components/horizon.yaml
@@ -9,8 +9,9 @@ apache_group: "$(auto:user)"
 # What user will apache be serving from.
 #
 # Root will typically not work (for apache on most distros)
-# sudo adduser <username> then sudo adduser <username> admin will be what you want to set this up (in ubuntu)
-# I typically use user "horizon" for ubuntu and the runtime user (who will have sudo access) for RHEL.
+# sudo adduser <username> then sudo adduser <username> admin will be what you want to set this up
+#
+# It will default to the running user if not provided...
 apache_user: "$(auto:user)"
 
 # Port horizon should run on
diff --git a/docs/source/topics/features.rst b/docs/source/topics/features.rst
index f2fa1d47..5cd67ad1 100644
--- a/docs/source/topics/features.rst
+++ b/docs/source/topics/features.rst
@@ -2,7 +2,6 @@
 Features
 ========
 
--  Multi distribution *actions* via a single tool
 -  A set of configuration files (in yaml format) that shows common/component/distribution configurations
 -  Supports the following *actions* on the various `OpenStack`_ components.
 
diff --git a/docs/source/topics/solvedproblems.rst b/docs/source/topics/solvedproblems.rst
index b938b31a..ed157640 100644
--- a/docs/source/topics/solvedproblems.rst
+++ b/docs/source/topics/solvedproblems.rst
@@ -13,45 +13,3 @@ Mysql user denied
 
 This seems common and can be fixed by running one of the steps at
 http://dev.mysql.com/doc/refman/5.0/en/resetting-permissions.html
-
-Mysql unknown instance
-----------------------
-
-This seems to happen sometimes with the following exception:
-
-::
-
-     ProcessExecutionError: None
-     Command: service mysql restart
-     Exit code: 1
-     Stdout: ''
-     Stderr: 'restart: Unknown instance: \n'
-
-     
-To resolve this the following seems to work:
-
-::
-
-    MYSQL_PKGS=`sudo dpkg --get-selections | grep mysql | cut -f 1`
-    echo $MYSQL_PKGS
-    sudo apt-get remove --purge $MYSQL_PKGS
-
-
-Horizon dead on start
----------------------
-
-If you get the following (when starting *horizon*) in ubuntu 11.10:
-
-::
-
-     .: 51: Can't open /etc/apache2/envvars
-
-Run:
-
-::
-
-     APACHE_PKGS=`sudo dpkg --get-selections | grep apache | cut -f 1`
-     echo $APACHE_PKGS
-     sudo apt-get remove --purge $APACHE_PKGS
-
-Then stop and uninstall and install to resolve this.
diff --git a/smithy b/smithy
index 36279883..1e69c51c 100755
--- a/smithy
+++ b/smithy
@@ -81,26 +81,6 @@ EOF
     return 0
 }
 
-bootstrap_ub()
-{
-    echo "Bootstrapping Ubuntu: $1"
-    echo "Please wait..."
-    echo "Installing needed distribution dependencies:"
-    pkgs="gcc git pep8 pylint python python-dev python-iniparse"
-    pkgs="$pkgs python-pip python-progressbar python-yaml python-cheetah python-iso8601"
-    apt-get install -y $pkgs
-    if [ $? -ne 0 ]; then
-        return 1
-    fi
-    echo "Installing needed pypi dependencies:"
-    pip install -U -I netifaces termcolor
-    if [ $? -ne 0 ]; then
-        return 1
-    fi
-    return 0
-    
-}
-
 load_rc_files()
 {
     for i in `ls *.rc 2>/dev/null`; do
@@ -150,23 +130,6 @@ if [[ "$TYPE" =~ "Red Hat Enterprise Linux Server" ]]; then
         echo "Bootstrapping RHEL $RH_VER failed."
         exit 1
     fi
-elif [[ "$TYPE" =~ "Ubuntu" ]]; then
-    UB_VER=$(lsb_release -r | cut  -f 2)
-    BC_OK=$(echo "$UB_VER < 11.10" | bc)
-    if [ "$BC_OK" == "1" ]; then
-        echo "This script must be ran on Ubuntu 11.10+ and not Ubuntu $UB_VER."
-        puke
-    fi
-    bootstrap_ub $UB_VER
-    if [ $? -eq 0 ]; then
-        for i in $BOOT_FILES; do
-            echo "$VER" > $i
-        done
-        run_smithy
-    else
-        echo "Bootstrapping Ubuntu $UB_VER failed."
-        exit 1
-    fi
 else
     echo "Anvil has not been tested on distribution '$TYPE'"
     puke