diff --git a/account-server.conf b/account-server.conf
deleted file mode 100644
index 1ffca8b..0000000
--- a/account-server.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[DEFAULT]
-bind_ip = 127.0.0.1
-bind_port = 6012
-workers = 2
-
-[pipeline:main]
-pipeline = account-server
-
-[app:account-server]
-use = egg:swift#account
-
-[account-replicator]
-
-[account-auditor]
-
-[account-reaper]
diff --git a/container-server.conf b/container-server.conf
deleted file mode 100644
index fa0de88..0000000
--- a/container-server.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[DEFAULT]
-bind_ip = 127.0.0.1
-bind_port = 6011
-workers = 2
-
-[pipeline:main]
-pipeline = container-server
-
-[app:container-server]
-use = egg:swift#container
-
-[container-replicator]
-
-[container-updater]
-
-[container-auditor]
-
-[container-sync]
diff --git a/gluster-swift-account-auditor.service b/gluster-swift-account-auditor.service
deleted file mode 100644
index 35413ce..0000000
--- a/gluster-swift-account-auditor.service
+++ /dev/null
@@ -1,12 +0,0 @@
-# After network.target just because.
-[Unit]
-Description=OpenStack Object Storage (swift) - Account Auditor
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-account-auditor /etc/swift/account-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-account-auditor@.service b/gluster-swift-account-auditor@.service
deleted file mode 100644
index 8b44df9..0000000
--- a/gluster-swift-account-auditor@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Account Auditor instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-account-auditor /etc/swift/account-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-account-reaper.service b/gluster-swift-account-reaper.service
deleted file mode 100644
index dd6fb00..0000000
--- a/gluster-swift-account-reaper.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Account Reaper
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-account-reaper /etc/swift/account-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-account-reaper@.service b/gluster-swift-account-reaper@.service
deleted file mode 100644
index dbd5aa4..0000000
--- a/gluster-swift-account-reaper@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Account Reaper instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-account-reaper /etc/swift/account-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-account-replicator.service b/gluster-swift-account-replicator.service
deleted file mode 100644
index 0cad889..0000000
--- a/gluster-swift-account-replicator.service
+++ /dev/null
@@ -1,12 +0,0 @@
-# After network.target just so replicator can talk to other nodes.
-[Unit]
-Description=OpenStack Object Storage (swift) - Account Replicator
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-account-replicator /etc/swift/account-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-account-replicator@.service b/gluster-swift-account-replicator@.service
deleted file mode 100644
index 65fbaa3..0000000
--- a/gluster-swift-account-replicator@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Account Replicator instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-account-replicator /etc/swift/account-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-account.init b/gluster-swift-account.init
deleted file mode 100755
index 4f1dbfd..0000000
--- a/gluster-swift-account.init
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          gluster-swift-account
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Stop:      0 1 6
-# Short-Description: Swift account server
-# Description:       Account server for swift.
-### END INIT INFO
-
-# gluster-swift-account: swift account server
-#
-# chkconfig: - 20 80
-# description: Account server for swift.
-
-. /etc/rc.d/init.d/functions
-. /usr/share/gluster-swift/functions
-
-name="account"
-
-[ -e "/etc/sysconfig/gluster-swift-$name" ] && . "/etc/sysconfig/gluster-swift-$name"
-
-lockfile="/var/lock/subsys/gluster-swift-account"
-
-start() {
-    swift_action "$name" start
-    retval=$?
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    swift_action "$name" stop
-    retval=$?
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-rh_status() {
-    swift_action "$name" status
-}
-
-rh_status_q() {
-    rh_status &> /dev/null
-}
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
-        exit 2
-esac
-exit $?
diff --git a/gluster-swift-account.service b/gluster-swift-account.service
deleted file mode 100644
index 782b06a..0000000
--- a/gluster-swift-account.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Account Server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-account-server /etc/swift/account-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-account@.service b/gluster-swift-account@.service
deleted file mode 100644
index cae48c7..0000000
--- a/gluster-swift-account@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Account Server instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-account-server /etc/swift/account-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-container-auditor.service b/gluster-swift-container-auditor.service
deleted file mode 100644
index 6359b91..0000000
--- a/gluster-swift-container-auditor.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Container Auditor
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-container-auditor /etc/swift/container-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-container-auditor@.service b/gluster-swift-container-auditor@.service
deleted file mode 100644
index 7c046da..0000000
--- a/gluster-swift-container-auditor@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Container Auditor instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-container-auditor /etc/swift/container-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-container-replicator.service b/gluster-swift-container-replicator.service
deleted file mode 100644
index 399f7b4..0000000
--- a/gluster-swift-container-replicator.service
+++ /dev/null
@@ -1,12 +0,0 @@
-# After network.target just so replicator can talk to other nodes.
-[Unit]
-Description=OpenStack Object Storage (swift) - Container Replicator
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-container-replicator /etc/swift/container-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-container-replicator@.service b/gluster-swift-container-replicator@.service
deleted file mode 100644
index 4803503..0000000
--- a/gluster-swift-container-replicator@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Container Replicator instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-container-replicator /etc/swift/container-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-container-updater.service b/gluster-swift-container-updater.service
deleted file mode 100644
index 6efc57e..0000000
--- a/gluster-swift-container-updater.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Container Updater
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-container-updater /etc/swift/container-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-container-updater@.service b/gluster-swift-container-updater@.service
deleted file mode 100644
index 19f99ff..0000000
--- a/gluster-swift-container-updater@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Container Updater instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-container-updater /etc/swift/container-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-container.init b/gluster-swift-container.init
deleted file mode 100755
index 1d27989..0000000
--- a/gluster-swift-container.init
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          gluster-swift-container
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Stop:      0 1 6
-# Short-Description: Swift container server
-# Description:       Container server for swift.
-### END INIT INFO
-
-# gluster-swift-container: swift container server
-#
-# chkconfig: - 20 80
-# description: Container server for swift.
-
-. /etc/rc.d/init.d/functions
-. /usr/share/gluster-swift/functions
-
-name="container"
-
-[ -e "/etc/sysconfig/gluster-swift-$name" ] && . "/etc/sysconfig/gluster-swift-$name"
-
-lockfile="/var/lock/subsys/gluster-swift-container"
-
-start() {
-    swift_action "$name" start
-    retval=$?
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    swift_action "$name" stop
-    retval=$?
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-rh_status() {
-    swift_action "$name" status
-}
-
-rh_status_q() {
-    rh_status &> /dev/null
-}
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
-        exit 2
-esac
-exit $?
diff --git a/gluster-swift-container.service b/gluster-swift-container.service
deleted file mode 100644
index 6db2b51..0000000
--- a/gluster-swift-container.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Container Server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-container-server /etc/swift/container-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-container@.service b/gluster-swift-container@.service
deleted file mode 100644
index 4f51e3f..0000000
--- a/gluster-swift-container@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Container Server instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-container-server /etc/swift/container-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-functions b/gluster-swift-functions
deleted file mode 100644
index 4b69ed8..0000000
--- a/gluster-swift-functions
+++ /dev/null
@@ -1,64 +0,0 @@
-# vim: filetype=sh
-
-. /etc/rc.d/init.d/functions
-
-swift_action() {
-  retval=0
-  server="$1"
-  call="swift_$2"
-
-  if [[ -f "/etc/swift/$server-server.conf" ]]; then
-    $call "$server" \
-          "/etc/swift/$server-server.conf" \
-          "/var/run/swift/$server-server.pid"
-    [ $? -ne 0 ] && retval=1
-  elif [[ -d "/etc/swift/$server-server/" ]]; then
-    declare -i count=0
-    mkdir -p /var/run/swift/$server-server
-    for name in $( ls "/etc/swift/$server-server/" ); do
-      $call "$server" \
-            "/etc/swift/$server-server/$name" \
-            "/var/run/swift/$server-server/$count.pid"
-      [ $? -ne 0 ] && retval=1
-      count=$count+1
-    done
-  fi
-  return $retval
-}
-
-swift_start() {
-  name="$1"
-  long_name="$name-server"
-  conf_file="$2"
-  pid_file="$3"
-
-  ulimit -n ${SWIFT_MAX_FILES-32768}
-  echo -n "Starting swift-$long_name: "
-  daemon --pidfile $pid_file \
-    "/usr/bin/swift-$long_name $conf_file &>/var/log/swift-startup.log & echo \$! > $pid_file"
-  retval=$?
-  echo
-  return $retval
-}
-
-swift_stop() {
-  name="$1"
-  long_name="$name-server"
-  conf_name="$2"
-  pid_file="$3"
-
-  echo -n "Stopping swift-$long_name: "
-  killproc -p $pid_file -d ${SWIFT_STOP_DELAY-15} $long_name
-  retval=$?
-  echo
-  return $retval
-}
-
-swift_status() {
-  name="$1"
-  long_name="$name-server"
-  conf_name="$2"
-  pid_file="$3"
-
-  status -p $pid_file $long_name
-}
diff --git a/gluster-swift-object-auditor.service b/gluster-swift-object-auditor.service
deleted file mode 100644
index 498d53e..0000000
--- a/gluster-swift-object-auditor.service
+++ /dev/null
@@ -1,12 +0,0 @@
-# After network.target just because.
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Auditor
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-auditor /etc/swift/object-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object-auditor@.service b/gluster-swift-object-auditor@.service
deleted file mode 100644
index f5c2537..0000000
--- a/gluster-swift-object-auditor@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Auditor instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-auditor /etc/swift/object-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object-expirer.service b/gluster-swift-object-expirer.service
deleted file mode 100644
index 1438427..0000000
--- a/gluster-swift-object-expirer.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Expirer
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-expirer /etc/swift/object-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object-expirer@.service b/gluster-swift-object-expirer@.service
deleted file mode 100644
index e7d03c3..0000000
--- a/gluster-swift-object-expirer@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Expirer instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-expirer /etc/swift/object-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object-replicator.service b/gluster-swift-object-replicator.service
deleted file mode 100644
index be1d3fa..0000000
--- a/gluster-swift-object-replicator.service
+++ /dev/null
@@ -1,12 +0,0 @@
-# After network.target just so replicator can talk to other nodes.
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Replicator
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-replicator /etc/swift/object-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object-replicator@.service b/gluster-swift-object-replicator@.service
deleted file mode 100644
index 7493398..0000000
--- a/gluster-swift-object-replicator@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Replicator instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-replicator /etc/swift/object-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object-updater.service b/gluster-swift-object-updater.service
deleted file mode 100644
index d9697a5..0000000
--- a/gluster-swift-object-updater.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Updater
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-updater /etc/swift/object-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object-updater@.service b/gluster-swift-object-updater@.service
deleted file mode 100644
index 9f223c7..0000000
--- a/gluster-swift-object-updater@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Updater instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-updater /etc/swift/object-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object.init b/gluster-swift-object.init
deleted file mode 100755
index f0fe540..0000000
--- a/gluster-swift-object.init
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          gluster-swift-object
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Stop:      0 1 6
-# Short-Description: Swift object server
-# Description:       Object server for swift.
-### END INIT INFO
-
-# gluster-swift-object: swift object server
-#
-# chkconfig: - 20 80
-# description: Object server for swift.
-
-. /etc/rc.d/init.d/functions
-. /usr/share/gluster-swift/functions
-
-name="object"
-
-[ -e "/etc/sysconfig/gluster-swift-$name" ] && . "/etc/sysconfig/gluster-swift-$name"
-
-lockfile="/var/lock/subsys/gluster-swift-object"
-
-start() {
-    swift_action "$name" start
-    retval=$?
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    swift_action "$name" stop
-    retval=$?
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-rh_status() {
-    swift_action "$name" status
-}
-
-rh_status_q() {
-    rh_status &> /dev/null
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
-        exit 2
-esac
-exit $?
diff --git a/gluster-swift-object.service b/gluster-swift-object.service
deleted file mode 100644
index 1cd5020..0000000
--- a/gluster-swift-object.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-server /etc/swift/object-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-object@.service b/gluster-swift-object@.service
deleted file mode 100644
index 172e322..0000000
--- a/gluster-swift-object@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Object Server instance %I
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-object-server /etc/swift/object-server/%i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift-proxy.init b/gluster-swift-proxy.init
deleted file mode 100755
index 052e05f..0000000
--- a/gluster-swift-proxy.init
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          gluster-swift-proxy
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Default-Stop:      0 1 6
-# Short-Description: Swift proxy server
-# Description:       Account server for swift.
-### END INIT INFO
-
-# gluster-swift-proxy: swift proxy server
-#
-# chkconfig: - 20 80
-# description: Proxy server for swift.
-
-. /etc/rc.d/init.d/functions
-. /usr/share/gluster-swift/functions
-
-name="proxy"
-
-[ -e "/etc/sysconfig/gluster-swift-$name" ] && . "/etc/sysconfig/gluster-swift-$name"
-
-lockfile="/var/lock/subsys/gluster-swift-proxy"
-
-start() {
-    swift_action "$name" start
-    retval=$?
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    swift_action "$name" stop
-    retval=$?
-    [ $retval -eq 0 ] && rm -f $lockfile
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-rh_status() {
-    swift_action "$name" status
-}
-
-rh_status_q() {
-    rh_status &> /dev/null
-}
-
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
-        exit 2
-esac
-exit $?
diff --git a/gluster-swift-proxy.service b/gluster-swift-proxy.service
deleted file mode 100644
index 4078f50..0000000
--- a/gluster-swift-proxy.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenStack Object Storage (swift) - Proxy Server
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=swift
-ExecStart=/usr/bin/swift-proxy-server /etc/swift/proxy-server.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/gluster-swift.tmpfs b/gluster-swift.tmpfs
deleted file mode 100644
index 8f4f5a5..0000000
--- a/gluster-swift.tmpfs
+++ /dev/null
@@ -1,6 +0,0 @@
-# swift needs a couple of directories in /var/run
-d /var/run/swift 0755 swift root
-d /var/run/swift/account-server 0755 swift root
-d /var/run/swift/container-server 0755 swift root
-d /var/run/swift/object-server 0755 swift root
-d /var/run/swift/proxy-server 0755 swift root
diff --git a/glusterfs.spec b/glusterfs.spec
index 58c4560..ae51961 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -22,7 +22,7 @@
 %{?_without_rdma:%global _without_rdma --disable-ibverbs}
 
 # No RDMA Support on s390(x)
-%ifarch s390 s390x
+%ifarch s390 s390x %{arm}
 %global _without_rdma --disable-ibverbs
 %endif
 
@@ -99,34 +99,37 @@
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
 %{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%global _rundir %{_localstatedir}/run
 %endif
 
 %if ( 0%{?_with_systemd:1} )
-%if ( 0%{_for_fedora_koji_builds} )
-%global _init_enable()  /bin/true ;
-%else
-%global _init_enable()  /bin/systemctl enable %1.service ;
-%endif
-%global _init_disable() /bin/systemctl disable %1.service ;
-%global _init_restart() /bin/systemctl try-restart %1.service ;
-%global _init_start()   /bin/systemctl start %1.service ;
-%global _init_stop()    /bin/systemctl stop %1.service ;
-%global _init_install() install -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service ;
+%global service_start()   /bin/systemctl --quiet start %1.service || : \
+%{nil}
+%global service_stop()    /bin/systemctl --quiet stop %1.service || :\
+%{nil}
+%global service_install() install -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service \
+%{nil}
 # can't seem to make a generic macro that works
-%global _init_glusterd   %{_unitdir}/glusterd.service
-%global _init_glusterfsd %{_unitdir}/glusterfsd.service
-%global _init_glustereventsd %{_unitdir}/glustereventsd.service
+%global glusterd_svcfile   %{_unitdir}/glusterd.service
+%global glusterfsd_svcfile %{_unitdir}/glusterfsd.service
+%global glustereventsd_svcfile %{_unitdir}/glustereventsd.service
 %else
-%global _init_enable()  /sbin/chkconfig --add %1 ;
-%global _init_disable() /sbin/chkconfig --del %1 ;
-%global _init_restart() /sbin/service %1 condrestart &>/dev/null ;
-%global _init_start()   /sbin/service %1 start &>/dev/null ;
-%global _init_stop()    /sbin/service %1 stop &>/dev/null ;
-%global _init_install() install -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 ;
+%global systemd_post()  /sbin/chkconfig --add %1 >/dev/null 2>&1 || : \
+%{nil}
+%global systemd_preun() /sbin/chkconfig --del %1 >/dev/null 2>&1 || : \
+%{nil}
+%global systemd_postun_with_restart() /sbin/service %1 condrestart >/dev/null 2>&1 || : \
+%{nil}
+%global service_start()   /sbin/service %1 start >/dev/null 2>&1 || : \
+%{nil}
+%global service_stop()    /sbin/service %1 stop >/dev/null 2>&1 || : \
+%{nil}
+%global service_install() install -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 \
+%{nil}
 # can't seem to make a generic macro that works
-%global _init_glusterd   %{_sysconfdir}/init.d/glusterd
-%global _init_glusterfsd %{_sysconfdir}/init.d/glusterfsd
-%global _init_glustereventsd %{_sysconfdir}/init.d/glustereventsd
+%global glusterd_svcfile   %{_sysconfdir}/init.d/glusterd
+%global glusterfsd_svcfile %{_sysconfdir}/init.d/glusterfsd
+%global glustereventsd_svcfile %{_sysconfdir}/init.d/glustereventsd
 %endif
 
 %if ( 0%{_for_fedora_koji_builds} )
@@ -167,7 +170,7 @@
 Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          3.10.0
+Version:          3.10.12
 Release:          1%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
@@ -441,6 +444,10 @@ Requires:         pcs, dbus
 %if ( 0%{?rhel} && 0%{?rhel} == 6 )
 Requires:         cman, pacemaker, corosync
 %endif
+%if ( 0%{?fedora} && 0%{?fedora} > 25 )
+Requires(post):   policycoreutils-python-utils
+Requires(postun): policycoreutils-python-utils
+%endif
 %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 )
 # we need portblock resource-agent in 3.9.5 and later.
 Requires:         resource-agents >= 3.9.5
@@ -536,8 +543,12 @@ Obsoletes:        python-gluster < 3.10
 %package rdma
 Summary:          GlusterFS rdma support for ib-verbs
 Group:            Applications/File
+%if ( 0%{?fedora} && 0%{?fedora} > 26 )
+BuildRequires:    rdma-core-devel
+%else
 BuildRequires:    libibverbs-devel
 BuildRequires:    librdmacm-devel >= 1.0.15
+%endif
 Requires:         %{name} = %{version}-%{release}
 
 %description rdma
@@ -718,7 +729,7 @@ install -D -p -m 0755 %{SOURCE6} \
 mkdir -p %{buildroot}%{_localstatedir}/log/glusterd
 mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs
 mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd
-mkdir -p %{buildroot}%{_localstatedir}/run/gluster
+mkdir -p %{buildroot}%{_rundir}/gluster
 
 # Remove unwanted files from all the shared libraries
 find %{buildroot}%{_libdir} -name '*.a' -delete
@@ -762,12 +773,19 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 
 # Install glusterfsd .service or init.d file
 %if ( 0%{_for_fedora_koji_builds} )
-%_init_install %{glusterfsd_service} glusterfsd
+%service_install %{glusterfsd_service} glusterfsd
 %endif
 
 install -D -p -m 0644 extras/glusterfs-logrotate \
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
 
+# ganesha ghosts
+mkdir -p %{buildroot}%{_sysconfdir}/ganesha
+touch %{buildroot}%{_sysconfdir}/ganesha/ganesha-ha.conf
+mkdir -p %{buildroot}%{_rundir}/gluster/shared_storage/nfs-ganesha/exports
+touch %{buildroot}%{_rundir}/gluster/shared_storage/nfs-ganesha/ganesha.conf
+touch %{buildroot}%{_rundir}/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf
+
 %if ( 0%{!?_without_georeplication:1} )
 # geo-rep ghosts
 mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
@@ -813,7 +831,7 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 %if ( 0%{!?_without_syslog:1} )
 %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
-%_init_restart rsyslog
+%systemd_postun_with_restart rsyslog
 %endif
 %endif
 exit 0
@@ -822,7 +840,7 @@ exit 0
 
 %if ( 0%{!?_without_events:1} )
 %post events
-%_init_restart glustereventsd
+%systemd_post glustereventsd
 exit 0
 %endif
 
@@ -832,10 +850,16 @@ modprobe fuse
 exit 0
 %endif
 
+%if ( 0%{?fedora} && 0%{?fedora} > 25 )
+%post ganesha
+semanage boolean -m ganesha_use_fusefs --on
+exit 0
+%endif
+
 %if ( 0%{!?_without_georeplication:1} )
 %post geo-replication
 if [ $1 -ge 1 ]; then
-    %_init_restart glusterd
+    %systemd_postun_with_restart glusterd
 fi
 exit 0
 %endif
@@ -846,9 +870,9 @@ exit 0
 
 %post server
 # Legacy server
-%_init_enable glusterd
+%systemd_post glusterd
 %if ( 0%{_for_fedora_koji_builds} )
-%_init_enable glusterfsd
+%systemd_post glusterfsd
 %endif
 # ".cmd_log_history" is renamed to "cmd_history.log" in GlusterFS-3.7 .
 # While upgrading glusterfs-server package form GlusterFS version <= 3.6 to
@@ -902,17 +926,17 @@ if [ $? -eq 0 ]; then
 
     #Cleaning leftover glusterd socket file which is created by glusterd in
     #rpm_script_t context.
-    rm -rf /var/run/glusterd.socket
+    rm -f %{_rundir}/glusterd.socket
 
     # glusterd _was_ running, we killed it, it exited after *.upgrade=on,
     # so start it again
-    %_init_start glusterd
+    %service_start glusterd
 else
     glusterd --xlator-option *.upgrade=on -N
 
     #Cleaning leftover glusterd socket file which is created by glusterd in
     #rpm_script_t context.
-    rm -rf /var/run/glusterd.socket
+    rm -f %{_rundir}/glusterd.socket
 fi
 exit 0
 
@@ -922,9 +946,9 @@ exit 0
 %if ( 0%{!?_without_events:1} )
 %preun events
 if [ $1 -eq 0 ]; then
-    if [ -f %_init_glustereventsd ]; then
-        %_init_stop glustereventsd
-        %_init_disable glustereventsd
+    if [ -f %glustereventsd_svcfile ]; then
+        %service_stop glustereventsd
+        %systemd_preun glustereventsd
     fi
 fi
 exit 0
@@ -932,20 +956,20 @@ exit 0
 
 %preun server
 if [ $1 -eq 0 ]; then
-    if [ -f %_init_glusterfsd ]; then
-        %_init_stop glusterfsd
+    if [ -f %glusterfsd_svcfile ]; then
+        %service_stop glusterfsd
     fi
-    %_init_stop glusterd
-    if [ -f %_init_glusterfsd ]; then
-        %_init_disable glusterfsd
+    %service_stop glusterd
+    if [ -f %glusterfsd_svcfile ]; then
+        %systemd_preun glusterfsd
     fi
-    %_init_disable glusterd
+    %systemd_preun glusterd
 fi
 if [ $1 -ge 1 ]; then
-    if [ -f %_init_glusterfsd ]; then
-        %_init_restart glusterfsd
+    if [ -f %glusterfsd_svcfile ]; then
+        %systemd_postun_with_restart glusterfsd
     fi
-    %_init_restart glusterd
+    %systemd_postun_with_restart glusterd
 fi
 exit 0
 
@@ -956,7 +980,7 @@ exit 0
 /sbin/ldconfig
 %if ( 0%{!?_without_syslog:1} )
 %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
-%_init_restart rsyslog
+%systemd_postun_with_restart rsyslog
 %endif
 %endif
 exit 0
@@ -965,6 +989,12 @@ exit 0
 /sbin/ldconfig
 exit 0
 
+%if ( 0%{?fedora} && 0%{?fedora} > 25 )
+%postun ganesha
+semanage boolean -m ganesha_use_fusefs --off
+exit 0
+%endif
+
 %postun libs
 /sbin/ldconfig
 exit 0
@@ -976,6 +1006,24 @@ exit 0
 %endif
 exit 0
 
+##-----------------------------------------------------------------------------
+## All %%trigger should be placed here and keep them sorted
+##
+%if ( 0%{?fedora} && 0%{?fedora} > 25 )
+%trigger ganesha -- selinux-policy-targeted
+semanage boolean -m ganesha_use_fusefs --on
+exit 0
+%endif
+
+##-----------------------------------------------------------------------------
+## All %%triggerun should be placed here and keep them sorted
+##
+%if ( 0%{?fedora} && 0%{?fedora} > 25 )
+%triggerun ganesha -- selinux-policy-targeted
+semanage boolean -m ganesha_use_fusefs --off
+exit 0
+%endif
+
 ##-----------------------------------------------------------------------------
 ## All %%files should be placed here and keep them sorted by groups
 ##
@@ -989,44 +1037,52 @@ exit 0
 %if ( 0%{!?_without_rdma:1} )
 %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
 %endif
+%dir %{_datadir}/glusterfs
 %dir %{_datadir}/glusterfs/scripts
-%{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
-%{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh
+     %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
+     %{_datadir}/glusterfs/scripts/pre-upgrade-script-for-quota.sh
 # xlators that are needed on the client- and on the server-side
+%dir %{_libdir}/glusterfs
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/auth
-%{_libdir}/glusterfs/%{version}%{?prereltag}/auth/addr.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/auth/login.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/addr.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/login.so
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport
-%{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/socket.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/socket.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/error-gen.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/error-gen.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so
 %if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) )
 # RHEL-5 based distributions have a too old openssl
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/crypt.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/crypt.so
 %endif
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-client.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/worm.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/meta.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-cache.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-threads.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/md-cache.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/open-behind.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/quick-read.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/read-ahead.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/readdir-ahead.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/stat-prefetch.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
-%dir %{_localstatedir}/run/gluster
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-client.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/worm.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/meta.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-cache.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-threads.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/md-cache.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/open-behind.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/quick-read.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/read-ahead.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/readdir-ahead.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/stat-prefetch.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
+%dir %{_rundir}/gluster
 %if 0%{?_tmpfilesdir:1}
 %{_tmpfilesdir}/gluster.conf
 %endif
@@ -1035,12 +1091,14 @@ exit 0
 %exclude %{_libdir}/*.so
 # libgfapi files
 %{_libdir}/libgfapi.*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api.so
 
 %files api-devel
 %{_libdir}/pkgconfig/glusterfs-api.pc
 %{_libdir}/libgfapi.so
-%{_includedir}/glusterfs/api/*
+%dir %{_includedir}/glusterfs/api
+     %{_includedir}/glusterfs/api/*
 
 %files cli
 %{_sbindir}/gluster
@@ -1048,40 +1106,47 @@ exit 0
 %{_sysconfdir}/bash_completion.d/gluster
 
 %files client-xlators
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so
-
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so
 
 %files devel
 %dir %{_includedir}/glusterfs
-%{_includedir}/glusterfs/*
+     %{_includedir}/glusterfs/*
 %exclude %{_includedir}/glusterfs/api
 %exclude %{_libdir}/libgfapi.so
 %{_libdir}/*.so
 # Glupy Translator examples
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/debug-trace.*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/helloworld.*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/negative.*
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/debug-trace.*
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/helloworld.*
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/negative.*
 %{_libdir}/pkgconfig/libgfchangelog.pc
 %if ( 0%{!?_without_tiering:1} )
 %{_libdir}/pkgconfig/libgfdb.pc
 %endif
 
 %files extra-xlators
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/features/template.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/features
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/features/template.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so
 # Glupy Python files
-%{python2_sitelib}/gluster/glupy/*
+%dir %{python2_sitelib}/gluster/glupy
+     %{python2_sitelib}/gluster/glupy/*
 
 %files fuse
 # glusterfs is a symlink to glusterfsd, -server depends on -fuse.
 %{_sbindir}/glusterfs
 %{_sbindir}/glusterfsd
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so
 /sbin/mount.glusterfs
 %if ( 0%{!?_without_fusermount:1} )
 %{_bindir}/fusermount-glusterfs
@@ -1093,10 +1158,17 @@ exit 0
 %endif
 
 %files ganesha
-%{_sysconfdir}/ganesha/*
+%dir %{_libexecdir}/ganesha
 %{_libexecdir}/ganesha/*
 %{_prefix}/lib/ocf/resource.d/heartbeat/*
 %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh
+%{_sysconfdir}/ganesha/ganesha-ha.conf.sample
+%ghost %config(noreplace) %{_sysconfdir}/ganesha/ganesha-ha.conf
+%ghost %dir %{_rundir}/gluster/shared_storage/nfs-ganesha
+%ghost %dir %{_rundir}/gluster/shared_storage/nfs-ganesha/exports
+%ghost %config(noreplace) %{_rundir}/gluster/shared_storage/nfs-ganesha/ganesha.conf
+%ghost %config(noreplace) %{_rundir}/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf
+
 
 %if ( 0%{!?_without_georeplication:1} )
 %files geo-replication
@@ -1104,15 +1176,17 @@ exit 0
 
 %{_sbindir}/gfind_missing_files
 %{_sbindir}/gluster-mountbroker
-%{_libexecdir}/glusterfs/gsyncd
-%{_libexecdir}/glusterfs/python/syncdaemon/*
-%{_libexecdir}/glusterfs/gverify.sh
-%{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh
-%{_libexecdir}/glusterfs/peer_gsec_create
-%{_libexecdir}/glusterfs/peer_mountbroker
-%{_libexecdir}/glusterfs/peer_mountbroker.py*
-%{_libexecdir}/glusterfs/gfind_missing_files
-%{_libexecdir}/glusterfs/peer_georep-sshkey.py*
+     %{_libexecdir}/glusterfs/gsyncd
+%dir %{_libexecdir}/glusterfs/python
+%dir %{_libexecdir}/glusterfs/python/syncdaemon
+     %{_libexecdir}/glusterfs/python/syncdaemon/*
+     %{_libexecdir}/glusterfs/gverify.sh
+     %{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh
+     %{_libexecdir}/glusterfs/peer_gsec_create
+     %{_libexecdir}/glusterfs/peer_mountbroker
+     %{_libexecdir}/glusterfs/peer_mountbroker.py*
+     %{_libexecdir}/glusterfs/gfind_missing_files
+     %{_libexecdir}/glusterfs/peer_georep-sshkey.py*
 %{_sbindir}/gluster-georep-sshkey
 
 
@@ -1123,12 +1197,12 @@ exit 0
             %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create/pre
 
-%{_datadir}/glusterfs/scripts/get-gfid.sh
-%{_datadir}/glusterfs/scripts/slave-upgrade.sh
-%{_datadir}/glusterfs/scripts/gsync-upgrade.sh
-%{_datadir}/glusterfs/scripts/generate-gfid-file.sh
-%{_datadir}/glusterfs/scripts/gsync-sync-gfid
-%{_datadir}/glusterfs/scripts/schedule_georep.py*
+     %{_datadir}/glusterfs/scripts/get-gfid.sh
+     %{_datadir}/glusterfs/scripts/slave-upgrade.sh
+     %{_datadir}/glusterfs/scripts/gsync-upgrade.sh
+     %{_datadir}/glusterfs/scripts/generate-gfid-file.sh
+     %{_datadir}/glusterfs/scripts/gsync-sync-gfid
+     %{_datadir}/glusterfs/scripts/schedule_georep.py*
 %endif
 
 %files libs
@@ -1143,20 +1217,22 @@ exit 0
 %files -n python2-gluster
 # introducing glusterfs module in site packages.
 # so that all other gluster submodules can reside in the same namespace.
-%{python2_sitelib}/gluster/__init__.*
-%{python2_sitelib}/gluster/cliutils
+%dir %{python2_sitelib}/gluster
+     %{python2_sitelib}/gluster/__init__.*
+     %{python2_sitelib}/gluster/cliutils
 
 %if ( 0%{!?_without_rdma:1} )
 %files rdma
-%{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
 %endif
 
 %if ( ! 0%{_for_fedora_koji_builds} )
 %files regression-tests
-%{_prefix}/share/glusterfs/run-tests.sh
-%{_prefix}/share/glusterfs/tests
-%{_datadir}/glusterfs/run-tests.sh
-%{_datadir}/glusterfs/tests
+%dir %{_prefix}/share/glusterfs
+     %{_prefix}/share/glusterfs/run-tests.sh
+%dir %{_prefix}/share/glusterfs/tests
+     %{_datadir}/glusterfs/run-tests.sh
+     %{_datadir}/glusterfs/tests/*
 %exclude %{_datadir}/glusterfs/tests/vagrant
 %endif
 
@@ -1171,16 +1247,16 @@ exit 0
 # sysconf
 %config(noreplace) %{_sysconfdir}/glusterfs
 %exclude %{_sysconfdir}/glusterfs/eventsconfig.json
-%dir %{_localstatedir}/run/gluster
+%dir %{_rundir}/gluster
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
 %if ( 0%{_for_fedora_koji_builds} )
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
 %endif
 
 # init files
-%_init_glusterd
+%glusterd_svcfile
 %if ( 0%{_for_fedora_koji_builds} )
-%_init_glusterfsd
+%glusterfsd_svcfile
 %endif
 
 # binaries
@@ -1190,26 +1266,31 @@ exit 0
 # {_sbindir}/glusterfsd is the actual binary, but glusterfs (client) is a
 # symlink. The binary itself (and symlink) are part of the glusterfs-fuse
 # package, because glusterfs-server depends on that anyway.
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
 %if ( 0%{!?_without_tiering:1} )
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so
 %endif
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage*
-%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota*
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt/glusterd.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/server.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so
+%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/bd.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so
+     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so
 %if ( 0%{!?_without_tiering:1} )
 %{_libdir}/libgfdb.so.*
 %endif
@@ -1271,7 +1352,7 @@ exit 0
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
-%ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
+%config(noreplace) %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub
@@ -1280,12 +1361,13 @@ exit 0
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols
 
 # Extra utility script
-%{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
+     %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
 
 # Incrementalapi
-%{_libexecdir}/glusterfs/glusterfind
+%dir %{_libexecdir}/glusterfs
+     %{_libexecdir}/glusterfs/glusterfind
+     %{_libexecdir}/glusterfs/peer_add_secret_pub
 %{_bindir}/glusterfind
-%{_libexecdir}/glusterfs/peer_add_secret_pub
 
 %if ( 0%{?_with_firewalld:1} )
 %{_prefix}/lib/firewalld/services/glusterfs.xml
@@ -1295,12 +1377,14 @@ exit 0
 %if ( 0%{!?_without_events:1} )
 %files events
 %config(noreplace) %{_sysconfdir}/glusterfs/eventsconfig.json
-%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/events
-%{_libexecdir}/glusterfs/events
-%{_libexecdir}/glusterfs/peer_eventsapi.py*
+%dir %{_sharedstatedir}/glusterd
+%dir %{_sharedstatedir}/glusterd/events
+%dir %{_libexecdir}/glusterfs/events
+     %{_libexecdir}/glusterfs/events/*
+     %{_libexecdir}/glusterfs/peer_eventsapi.py*
 %{_sbindir}/glustereventsd
 %{_sbindir}/gluster-eventsapi
-%{_datadir}/glusterfs/scripts/eventsdash.py*
+     %{_datadir}/glusterfs/scripts/eventsdash.py*
 %if ( 0%{?_with_systemd:1} )
 %{_unitdir}/glustereventsd.service
 %else
@@ -1309,6 +1393,57 @@ exit 0
 %endif
 
 %changelog
+* Tue Apr 24 2018 Niels de Vos <ndevos@redhat.com> - 3.10.12-1
+- 3.10.12 GA
+
+* Thu Mar 1 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.11-1
+- 3.10.11 GA
+
+* Wed Jan 31 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.10-1
+- 3.10.10 GA
+
+* Thu Jan 4 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.9-1
+- 3.10.9 GA
+
+* Thu Nov 30 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.8-1
+- 3.10.8 GA
+
+* Tue Oct 31 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.7-1
+- 3.10.7 GA
+
+* Mon Oct 23 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.6-4
+- 3.10.6 bz #1504256
+
+* Fri Oct 6 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.6-3
+- 3.10.6 w/ BZ 1497990 again
+
+* Tue Oct 3 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.6-2
+- 3.10.6 w/ BZ 1497990
+
+* Tue Oct 3 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.6-1
+- 3.10.6 GA
+
+* Sat Aug 12 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.5-1
+- 3.10.5 GA
+
+* Thu Jul 27 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.4-3
+- 3.10.4, bz #1473197, again
+
+* Wed Jul 26 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.4-2
+- 3.10.4, bz #1473197
+
+* Thu Jul 6 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.4-1
+- 3.10.4 GA
+
+* Thu Jun 1 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.3-1
+- 3.10.3 GA
+
+* Sun May 14 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.2-1
+- 3.10.2 GA
+
+* Thu Mar 30 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.1-1
+- 3.10.1 GA
+
 * Thu Feb 23 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.0-1
 - 3.10.0 GA
 
diff --git a/object-expirer.conf b/object-expirer.conf
deleted file mode 100644
index b75963c..0000000
--- a/object-expirer.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[DEFAULT]
-
-[object-expirer]
-# auto_create_account_prefix = .
-
-[pipeline:main]
-pipeline = catch_errors cache proxy-server
-
-[app:proxy-server]
-use = egg:swift#proxy
-
-[filter:cache]
-use = egg:swift#memcache
-memcache_servers = 127.0.0.1:11211
-
-[filter:catch_errors]
-use = egg:swift#catch_errors
diff --git a/object-server.conf b/object-server.conf
deleted file mode 100644
index 3a3d9be..0000000
--- a/object-server.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-[DEFAULT]
-bind_ip = 127.0.0.1
-bind_port = 6010
-workers = 3
-
-[pipeline:main]
-pipeline = object-server
-
-[app:object-server]
-use = egg:swift#object
-
-[object-replicator]
-
-[object-updater]
-
-[object-auditor]
diff --git a/proxy-server.conf b/proxy-server.conf
deleted file mode 100644
index 3e4b88a..0000000
--- a/proxy-server.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-[DEFAULT]
-bind_port = 8080
-workers = 8
-user = swift
-
-[pipeline:main]
-pipeline = healthcheck cache authtoken keystone proxy-server
-
-[app:proxy-server]
-use = egg:swift#proxy
-allow_account_management = true
-account_autocreate = true
-
-[filter:cache]
-use = egg:swift#memcache
-memcache_servers = 127.0.0.1:11211
-
-[filter:catch_errors]
-use = egg:swift#catch_errors
-
-[filter:healthcheck]
-use = egg:swift#healthcheck
-
-[filter:keystone]
-paste.filter_factory = keystone.middleware.swift_auth:filter_factory
-operator_roles = admin, SwiftOperator
-is_admin = true
-cache = swift.cache
-
-[filter:authtoken]
-paste.filter_factory = keystone.middleware.auth_token:filter_factory
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-signing_dir = /tmp/keystone-signing-swift
-
diff --git a/sources b/sources
index 10277d9..ea7fc03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-3.10.0.tar.gz) = eeb6ef61e33b9a5afd59802aa641d67ac9b48dc1d1e08c302a744765b3f63dc479cd13b41df9e874dc2a194b038e85d1f94209112df4269d8b00cd5bf6b05449
+SHA512 (glusterfs-3.10.12.tar.gz) = 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d
diff --git a/swift.conf b/swift.conf
deleted file mode 100644
index adbd96f..0000000
--- a/swift.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[swift-hash]
-swift_hash_path_suffix = %SWIFT_HASH_PATH_SUFFIX%