@@ -2,7 +2,7 @@ DevStack is a set of scripts and utilities to quickly deploy an OpenStack cloud.

 # Goals

-* To quickly build dev OpenStack environments in a clean Oneiric or Precise environment

+* To quickly build dev OpenStack environments in a clean Ubuntu or Fedora environment

 * To describe working configurations of OpenStack (which code branches work together?  what do config files look like for those branches?)

 * To make it easier for developers to dive into OpenStack so that they can productively contribute without having to understand every part of the system at once

 * To make it easy to prototype cross-project features

deleted file mode 100644

@@ -1,28 +0,0 @@

-<VirtualHost *:80>

-    WSGIScriptAlias / %HORIZON_DIR%/openstack_dashboard/wsgi/django.wsgi

-    WSGIDaemonProcess horizon user=%USER% group=%GROUP% processes=3 threads=10

-    SetEnv APACHE_RUN_USER %USER%

-    SetEnv APACHE_RUN_GROUP %GROUP%

-    WSGIProcessGroup horizon

-

-    DocumentRoot %HORIZON_DIR%/.blackhole/

-    Alias /media %HORIZON_DIR%/openstack_dashboard/static

-    Alias /vpn /opt/stack/vpn

-

-    <Directory />

-        Options FollowSymLinks

-        AllowOverride None

-    </Directory>

-

-    <Directory %HORIZON_DIR%/>

-        Options Indexes FollowSymLinks MultiViews

-        AllowOverride None

-        Order allow,deny

-        allow from all

-    </Directory>

-

-    ErrorLog /var/log/apache2/error.log

-    LogLevel warn

-    CustomLog /var/log/apache2/access.log combined

-</VirtualHost>

-

new file mode 100644

@@ -0,0 +1,29 @@

+<VirtualHost *:80>

+    WSGIScriptAlias / %HORIZON_DIR%/openstack_dashboard/wsgi/django.wsgi

+    WSGIDaemonProcess horizon user=%USER% group=%GROUP% processes=3 threads=10 home=%HORIZON_DIR%

+

+    SetEnv APACHE_RUN_USER %USER%

+    SetEnv APACHE_RUN_GROUP %GROUP%

+    WSGIProcessGroup horizon

+

+    DocumentRoot %HORIZON_DIR%/.blackhole/

+    Alias /media %HORIZON_DIR%/openstack_dashboard/static

+

+    <Directory />

+        Options FollowSymLinks

+        AllowOverride None

+    </Directory>

+

+    <Directory %HORIZON_DIR%/>

+        Options Indexes FollowSymLinks MultiViews

+        AllowOverride None

+        Order allow,deny

+        allow from all

+    </Directory>

+

+    ErrorLog /var/log/%APACHE_NAME%/horizon_error.log

+    LogLevel warn

+    CustomLog /var/log/%APACHE_NAME%/horizon_access.log combined

+</VirtualHost>

+

+WSGISocketPrefix /var/run/%APACHE_NAME%

@@ -1,3 +1,5 @@

+django-mailer    # dist:f16

+django-nose      # dist:f16

 django-nose-selenium

 pycrypto==2.3

 python-cloudfiles

new file mode 100644

@@ -0,0 +1,14 @@

+curl

+euca2ools # only for testing client

+git-core

+openssh-server

+psmisc

+pylint

+python-pep8

+python-pip

+python-unittest2

+python-virtualenv

+screen

+tcpdump

+unzip

+wget

new file mode 100644

@@ -0,0 +1,8 @@

+python-argparse

+python-eventlet

+python-greenlet

+python-paste-deploy

+python-routes

+python-sqlalchemy

+python-wsgiref

+pyxattr

new file mode 100644

@@ -0,0 +1,25 @@

+Django

+django-registration

+gcc

+httpd # NOPRIME

+mod_wsgi  # NOPRIME

+pylint

+python-anyjson

+python-boto

+python-coverage

+python-dateutil

+python-eventlet

+python-greenlet

+python-httplib2

+python-kombu

+python-migrate

+python-mox

+python-nose

+python-paste

+python-paste-deploy

+python-pep8

+python-routes

+python-sphinx

+python-sqlalchemy

+python-webob

+pyxattr

new file mode 100644

@@ -0,0 +1,11 @@

+python-greenlet

+python-lxml

+python-paste

+python-paste-deploy

+python-paste-script

+python-routes

+python-setuptools

+python-sqlalchemy

+python-sqlite2

+python-webob

+sqlite

new file mode 100644

@@ -0,0 +1 @@

+python-dateutil

new file mode 100644

@@ -0,0 +1,3 @@

+# Stuff for diablo volumes

+iscsi-initiator-utils

+lvm2

new file mode 100644

@@ -0,0 +1 @@

+numpy

new file mode 100644

@@ -0,0 +1,2 @@

+lvm2

+scsi-target-utils

new file mode 100644

@@ -0,0 +1,39 @@

+MySQL-python

+curl

+dnsmasq-utils # for dhcp_release

+ebtables

+gawk

+iptables

+iputils

+kpartx

+kvm

+libvirt-bin # NOPRIME

+libvirt-python

+libxml2-python

+m2crypto

+mysql-server # NOPRIME

+parted

+python-boto

+python-carrot

+python-cheetah

+python-eventlet

+python-feedparser

+python-gflags

+python-greenlet

+python-iso8601

+python-kombu

+python-lockfile

+python-migrate

+python-mox

+python-netaddr

+python-paramiko

+python-paste

+python-paste-deploy

+python-routes

+python-sqlalchemy

+python-suds

+python-tempita

+rabbitmq-server # NOPRIME

+sqlite

+sudo

+vconfig

new file mode 100644

@@ -0,0 +1,18 @@

+curl

+gcc

+memcached # NOPRIME

+python-configobj

+python-coverage

+python-devel

+python-eventlet

+python-greenlet

+python-netifaces

+python-nose

+python-paste-deploy

+python-setuptools

+python-simplejson

+python-webob

+pyxattr

+sqlite

+xfsprogs

+xinetd

@@ -298,21 +298,42 @@ function pip_install {

 # Service wrapper to restart services

 # restart_service service-name

 function restart_service() {

-    sudo /usr/sbin/service $1 restart

+    if [[ -z "$os_PACKAGE" ]]; then

+        GetOSVersion

+    fi

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        sudo /usr/sbin/service $1 restart

+    else

+        sudo /sbin/service $1 restart

+    fi

 }

 # Service wrapper to start services

 # start_service service-name

 function start_service() {

-    sudo /usr/sbin/service $1 start

+    if [[ -z "$os_PACKAGE" ]]; then

+        GetOSVersion

+    fi

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        sudo /usr/sbin/service $1 start

+    else

+        sudo /sbin/service $1 start

+    fi

 }

 # Service wrapper to stop services

 # stop_service service-name

 function stop_service() {

-    sudo /usr/sbin/service $1 stop

+    if [[ -z "$os_PACKAGE" ]]; then

+        GetOSVersion

+    fi

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        sudo /usr/sbin/service $1 stop

+    else

+        sudo /sbin/service $1 stop

+    fi

 }

@@ -32,6 +32,9 @@ GetOSVersion

 if [[ "$os_VENDOR" =~ (Ubuntu) ]]; then

     # 'Everyone' refers to Ubuntu releases by the code name adjective

     DISTRO=$os_CODENAME

+elif [[ "$os_VENDOR" =~ (Fedora) ]]; then

+    # For Fedora, just use 'f' and the release

+    DISTRO="f$os_RELEASE"

 else

     # Catch-all for now is Vendor + Release + Update

     DISTRO="$os_VENDOR-$os_RELEASE.$os_UPDATE"

@@ -72,7 +75,7 @@ if [[ ! -r $TOP_DIR/stackrc ]]; then

     echo "ERROR: missing $TOP_DIR/stackrc - did you grab more than just stack.sh?"

     exit 1

 fi

-source ./stackrc

+source $TOP_DIR/stackrc

 # Destination path for installation ``DEST``

 DEST=${DEST:-/opt/stack}

@@ -83,14 +86,21 @@ DEST=${DEST:-/opt/stack}

 # Warn users who aren't on an explicitly supported distro, but allow them to

 # override check and attempt installation with ``FORCE=yes ./stack``

-if [[ ! ${DISTRO} =~ (oneiric|precise) ]]; then

-    echo "WARNING: this script has only been tested on oneiric and precise"

+if [[ ! ${DISTRO} =~ (oneiric|precise|f16) ]]; then

+    echo "WARNING: this script has been tested on oneiric, precise and f16"

     if [[ "$FORCE" != "yes" ]]; then

         echo "If you wish to run this script anyway run with FORCE=yes"

         exit 1

     fi

 fi

+# Set the paths of certain binaries

+if [[ "$os_PACKAGE" = "deb" ]]; then

+    NOVA_ROOTWRAP=/usr/local/bin/nova-rootwrap

+else

+    NOVA_ROOTWRAP=/usr/bin/nova-rootwrap

+fi

+

 # stack.sh keeps the list of ``apt`` and ``pip`` dependencies in external

 # files, along with config templates and other useful files.  You can find these

 # in the ``files`` directory (next to this script).  We will reference this

@@ -122,11 +132,16 @@ if [[ $EUID -eq 0 ]]; then

     # since this script runs as a normal user, we need to give that user

     # ability to run sudo

-    dpkg -l sudo || apt_get update && install_package sudo

-

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        dpkg -l sudo || apt_get update && install_package sudo

+        STACK_GROUP=sudo

+    else

+        rpm -qa | grep sudo || install_package sudo

+        STACK_GROUP=wheel

+    fi

     if ! getent passwd stack >/dev/null; then

         echo "Creating a user called stack"

-        useradd -U -G sudo -s /bin/bash -d $DEST -m stack

+        useradd -U -G $STACK_GROUP -s /bin/bash -d $DEST -m stack

     fi

     echo "Giving stack user passwordless sudo priviledges"

@@ -148,7 +163,12 @@ if [[ $EUID -eq 0 ]]; then

     exit 1

 else

     # We're not root, make sure sudo is available

-    dpkg -l sudo || die "Sudo is required.  Re-run stack.sh as root ONE TIME ONLY to set up sudo."

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        CHECK_SUDO_CMD="dpkg -l sudo"

+    else

+        CHECK_SUDO_CMD="rpm -q sudo"

+    fi

+    $CHECK_SUDO_CMD || die "Sudo is required.  Re-run stack.sh as root ONE TIME ONLY to set up sudo."

     # UEC images /etc/sudoers does not have a '#includedir'. add one.

     sudo grep -q "^#includedir.*/etc/sudoers.d" /etc/sudoers ||

@@ -163,7 +183,7 @@ else

     # Set up the rootwrap sudoers

     TEMPFILE=`mktemp`

-    echo "$USER ALL=(root) NOPASSWD: /usr/local/bin/nova-rootwrap" >$TEMPFILE

+    echo "$USER ALL=(root) NOPASSWD: $NOVA_ROOTWRAP" >$TEMPFILE

     chmod 0440 $TEMPFILE

     sudo chown root:root $TEMPFILE

     sudo mv $TEMPFILE /etc/sudoers.d/nova-rootwrap

@@ -549,6 +569,8 @@ fi

 # - ``# NOPRIME`` defers installation to be performed later in stack.sh

 # - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection

 #   of the package to the distros listed.  The distro names are case insensitive.

+#

+# get_packages dir

 function get_packages() {

     local package_dir=$1

     local file_to_parse

@@ -558,7 +580,8 @@ function get_packages() {

         echo "No package directory supplied"

         return 1

     fi

-    for service in general ${ENABLED_SERVICES//,/ }; do        # Allow individual services to specify dependencies

+    for service in general ${ENABLED_SERVICES//,/ }; do

+        # Allow individual services to specify dependencies

         if [[ -e ${package_dir}/${service} ]]; then

             file_to_parse="${file_to_parse} $service"

         fi

@@ -604,9 +627,13 @@ function get_packages() {

     done

 }

-# install apt requirements

-apt_get update

-install_package $(get_packages $FILES/apts)

+# install package requirements

+if [[ "$os_PACKAGE" = "deb" ]]; then

+    apt_get update

+    install_package $(get_packages $FILES/apts)

+else

+    install_package $(get_packages $FILES/rpms)

+fi

 # install python requirements

 pip_install $(get_packages $FILES/pips | sort -u)

@@ -722,6 +749,10 @@ if is_service_enabled rabbit; then

     install_package rabbitmq-server > "$tfile" 2>&1

     cat "$tfile"

     rm -f "$tfile"

+    if [[ "$os_PACKAGE" = "rpm" ]]; then

+        # RPM doesn't start the service

+        restart_service rabbitmq-server

+    fi

     # change the rabbit password since the default is "guest"

     sudo rabbitmqctl change_password guest $RABBIT_PASSWORD

 fi

@@ -732,13 +763,15 @@ fi

 if is_service_enabled mysql; then

-    # Seed configuration with mysql password so that apt-get install doesn't

-    # prompt us for a password upon install.

-    cat <<MYSQL_PRESEED | sudo debconf-set-selections

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        # Seed configuration with mysql password so that apt-get install doesn't

+        # prompt us for a password upon install.

+        cat <<MYSQL_PRESEED | sudo debconf-set-selections

 mysql-server-5.1 mysql-server/root_password password $MYSQL_PASSWORD

 mysql-server-5.1 mysql-server/root_password_again password $MYSQL_PASSWORD

 mysql-server-5.1 mysql-server/start_on_boot boolean true

 MYSQL_PRESEED

+    fi

     # while ``.my.cnf`` is not needed for openstack to function, it is useful

     # as it allows you to access the mysql databases via ``mysql nova`` instead

@@ -755,12 +788,25 @@ EOF

     # Install and start mysql-server

     install_package mysql-server

+    if [[ "$os_PACKAGE" = "rpm" ]]; then

+        # RPM doesn't start the service

+        start_service mysqld

+        # Set the root password - only works the first time

+        sudo mysqladmin -u root password $MYSQL_PASSWORD || true

+    fi

     # Update the DB to give user ‘$MYSQL_USER’@’%’ full control of the all databases:

     sudo mysql -uroot -p$MYSQL_PASSWORD -h127.0.0.1 -e "GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%' identified by '$MYSQL_PASSWORD';"

     # Edit /etc/mysql/my.cnf to change ‘bind-address’ from localhost (127.0.0.1) to any (0.0.0.0) and restart the mysql service:

-    sudo sed -i 's/127.0.0.1/0.0.0.0/g' /etc/mysql/my.cnf

-    restart_service mysql

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        MY_CNF=/etc/mysql/my.cnf

+        MYSQL=mysql

+    else

+        MY_CNF=/etc/my.cnf

+        MYSQL=mysqld

+    fi

+    sudo sed -i 's/127.0.0.1/0.0.0.0/g' $MY_CNF

+    restart_service $MYSQL

 fi

 if [ -z "$SCREEN_HARDSTATUS" ]; then

@@ -820,10 +866,6 @@ screen -r stack -X hardstatus alwayslastline "$SCREEN_HARDSTATUS"

 if is_service_enabled horizon; then

-    # Install apache2, which is NOPRIME'd

-    install_package apache2 libapache2-mod-wsgi

-

-

     # Remove stale session database.

     rm -f $HORIZON_DIR/openstack_dashboard/local/dashboard_openstack.sqlite3

@@ -835,18 +877,38 @@ if is_service_enabled horizon; then

     # users).  The user system is external (keystone).

     cd $HORIZON_DIR

     python manage.py syncdb

+    cd $TOP_DIR

     # create an empty directory that apache uses as docroot

     sudo mkdir -p $HORIZON_DIR/.blackhole

-    ## Configure apache's 000-default to run horizon

-    sudo cp $FILES/000-default.template /etc/apache2/sites-enabled/000-default

-    sudo sed -e "

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        # Install apache2, which is NOPRIME'd

+        APACHE_NAME=apache2

+        APACHE_CONF=sites-available/horizon

+        install_package apache2 libapache2-mod-wsgi

+        # Clean up the old config name

+        sudo rm -f /etc/apache2/sites-enabled/000-default

+        # Be a good citizen and use the distro tools here

+        sudo touch /etc/$APACHE_NAME/$APACHE_CONF

+        sudo a2ensite horizon

+    else

+        # Install httpd, which is NOPRIME'd

+        APACHE_NAME=httpd

+        APACHE_CONF=conf.d/horizon.conf

+        sudo rm -f /etc/httpd/conf.d/000-*

+        install_package httpd mod_wsgi

+        sudo sed '/^Listen/s/^.*$/Listen 0.0.0.0:80/' -i /etc/httpd/conf/httpd.conf

+    fi

+    ## Configure apache to run horizon

+    sudo sh -c "sed -e \"

         s,%USER%,$APACHE_USER,g;

         s,%GROUP%,$APACHE_GROUP,g;

         s,%HORIZON_DIR%,$HORIZON_DIR,g;

-    " -i /etc/apache2/sites-enabled/000-default

-    restart_service apache2

+        s,%APACHE_NAME%,$APACHE_NAME,g;

+        s,%DEST%,$DEST,g;

+    \" $FILES/apache-horizon.template >/etc/$APACHE_NAME/$APACHE_CONF"

+    restart_service $APACHE_NAME

 fi

@@ -921,8 +983,13 @@ if is_service_enabled q-svc; then

     if [[ "$Q_PLUGIN" = "openvswitch" ]]; then

         # Install deps

         # FIXME add to files/apts/quantum, but don't install if not needed!

-        kernel_version=`cat /proc/version | cut -d " " -f3`

-        install_package openvswitch-switch openvswitch-datapath-dkms linux-headers-$kernel_version

+        if [[ "$os_PACKAGE" = "deb" ]]; then

+            kernel_version=`cat /proc/version | cut -d " " -f3`

+            install_package openvswitch-switch openvswitch-datapath-dkms linux-headers-$kernel_version

+        else

+            ### FIXME(dtroyer): Find RPMs for OpenVSwitch

+            echo "OpenVSwitch packages need to be located"

+        fi

         # Create database for the plugin/agent

         if is_service_enabled mysql; then

             mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS ovs_quantum;'

@@ -1044,7 +1111,12 @@ if is_service_enabled n-cpu; then

     # Virtualization Configuration

     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-    install_package libvirt-bin

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        LIBVIRT_PKG_NAME=libvirt-bin

+    else

+        LIBVIRT_PKG_NAME=libvirt

+    fi

+    install_package $LIBVIRT_PKG_NAME

     # Force IP forwarding on, just on case

     sudo sysctl -w net.ipv4.ip_forward=1

@@ -1067,27 +1139,50 @@ if is_service_enabled n-cpu; then

     # splitting a system into many smaller parts.  LXC uses cgroups and chroot

     # to simulate multiple systems.

     if [[ "$LIBVIRT_TYPE" == "lxc" ]]; then

-        if [[ "$DISTRO" > natty ]]; then

-            install_package cgroup-lite

-        else

-            cgline="none /cgroup cgroup cpuacct,memory,devices,cpu,freezer,blkio 0 0"

-            sudo mkdir -p /cgroup

-            if ! grep -q cgroup /etc/fstab; then

-                echo "$cgline" | sudo tee -a /etc/fstab

-            fi

-            if ! mount -n | grep -q cgroup; then

-                sudo mount /cgroup

+        if [[ "$os_PACKAGE" = "deb" ]]; then

+            if [[ "$DISTRO" > natty ]]; then

+                install_package cgroup-lite

+            else

+                cgline="none /cgroup cgroup cpuacct,memory,devices,cpu,freezer,blkio 0 0"

+                sudo mkdir -p /cgroup

+                if ! grep -q cgroup /etc/fstab; then

+                    echo "$cgline" | sudo tee -a /etc/fstab

+                fi

+                if ! mount -n | grep -q cgroup; then

+                    sudo mount /cgroup

+                fi

             fi

+        else

+            ### FIXME(dtroyer): figure this out

+            echo "RPM-based cgroup not implemented yet"

+            yum_install libcgroup-tools

         fi

     fi

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        LIBVIRT_DAEMON=libvirt-bin

+    else

+        # http://wiki.libvirt.org/page/SSHPolicyKitSetup

+        if ! grep ^libvirtd: /etc/group >/dev/null; then

+            sudo groupadd libvirtd

+        fi

+        sudo bash -c 'cat <<EOF >/etc/polkit-1/localauthority/50-local.d/50-libvirt-remote-access.pkla

+[libvirt Management Access]

+Identity=unix-group:libvirtd

+Action=org.libvirt.unix.manage

+ResultAny=yes

+ResultInactive=yes

+ResultActive=yes

+EOF'

+        LIBVIRT_DAEMON=libvirtd

+    fi

     # The user that nova runs as needs to be member of libvirtd group otherwise

     # nova-compute will be unable to use libvirt.

     sudo usermod -a -G libvirtd `whoami`

     # libvirt detects various settings on startup, as we potentially changed

     # the system configuration (modules, filesystems), we need to restart

     # libvirt to detect those changes.

-    restart_service libvirt-bin

+    restart_service $LIBVIRT_DAEMON

     # Instance Storage

@@ -1202,7 +1297,11 @@ if is_service_enabled swift; then

         s/%USER%/$USER/;

         s,%SWIFT_DATA_DIR%,$SWIFT_DATA_DIR,;

     " $FILES/swift/rsyncd.conf | sudo tee /etc/rsyncd.conf

-   sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync

+    else

+        sudo sed -i '/disable *= *yes/ { s/yes/no/ }' /etc/xinetd.d/rsync

+    fi

    # By default Swift will be installed with the tempauth middleware

    # which has some default username and password if you have

@@ -1267,10 +1366,10 @@ if is_service_enabled swift; then

    swift_log_dir=${SWIFT_DATA_DIR}/logs

    rm -rf ${swift_log_dir}

    mkdir -p ${swift_log_dir}/hourly

-   sudo chown -R syslog:adm ${swift_log_dir}

+   sudo chown -R $USER:adm ${swift_log_dir}

    sed "s,%SWIFT_LOGDIR%,${swift_log_dir}," $FILES/swift/rsyslog.conf | sudo \

        tee /etc/rsyslog.d/10-swift.conf

-   sudo restart rsyslog

+   restart_service rsyslog

    # This is where we create three different rings for swift with

    # different object servers binding on different ports.

@@ -1304,10 +1403,12 @@ if is_service_enabled swift; then

    } && popd >/dev/null

-   sudo chmod +x /usr/local/bin/swift-*

-

    # We then can start rsync.

-   sudo /etc/init.d/rsync restart || :

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        sudo /etc/init.d/rsync restart || :

+    else

+        sudo systemctl start xinetd.service

+    fi

    # First spawn all the swift services then kill the

    # proxy service so we can run it in foreground in screen.

@@ -1332,9 +1433,6 @@ if is_service_enabled n-vol; then

     #

     # By default, the backing file is 2G in size, and is stored in /opt/stack.

-    # install the package

-    install_package tgt

-

     if ! sudo vgs $VOLUME_GROUP; then

         VOLUME_BACKING_FILE=${VOLUME_BACKING_FILE:-$DEST/nova-volumes-backing-file}

         VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-2052M}

@@ -1357,10 +1455,15 @@ if is_service_enabled n-vol; then

         done

     fi

-    # tgt in oneiric doesn't restart properly if tgtd isn't running

-    # do it in two steps

-    sudo stop tgt || true

-    sudo start tgt

+    if [[ "$os_PACKAGE" = "deb" ]]; then

+        # tgt in oneiric doesn't restart properly if tgtd isn't running

+        # do it in two steps

+        sudo stop tgt || true

+        sudo start tgt

+    else

+        # bypass redirection to systemctl during restart

+        sudo /sbin/service --skip-redirect tgtd restart

+    fi

 fi

 NOVA_CONF=nova.conf

@@ -1377,7 +1480,7 @@ add_nova_opt "[DEFAULT]"

 add_nova_opt "verbose=True"

 add_nova_opt "auth_strategy=keystone"

 add_nova_opt "allow_resize_to_same_host=True"

-add_nova_opt "root_helper=sudo /usr/local/bin/nova-rootwrap"

+add_nova_opt "root_helper=sudo $NOVA_ROOTWRAP"

 add_nova_opt "compute_scheduler_driver=$SCHEDULER"

 add_nova_opt "dhcpbridge_flagfile=$NOVA_CONF_DIR/$NOVA_CONF"

 add_nova_opt "fixed_range=$FIXED_RANGE"

@@ -1661,7 +1764,7 @@ screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"

 screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_CONF_DIR/$NOVA_CONF --web ."

 screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --config-file $NOVA_CONF_DIR/$NOVA_CONF"

 screen_it n-cauth "cd $NOVA_DIR && ./bin/nova-consoleauth"

-screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/apache2/error.log"

+screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/$APACHE_NAME/horizon_error.log"

 screen_it swift "cd $SWIFT_DIR && $SWIFT_DIR/bin/swift-proxy-server ${SWIFT_CONFIG_DIR}/proxy-server.conf -v"

 # Starting the nova-objectstore only if swift service is not enabled.

@@ -49,7 +49,7 @@ if is_service_enabled n-vol; then

         echo "iSCSI target cleanup needed:"

         echo "$TARGETS"

     fi

-    sudo stop tgt

+    stop_service tgt

 fi

 if [[ -n "$UNSTACK_ALL" ]]; then