diff --git a/modules.env b/modules.env
index 3c7f032d93..97fcdfbb74 100644
--- a/modules.env
+++ b/modules.env
@@ -86,6 +86,7 @@ INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-logstash"]
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-mailman"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-meetbot"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-mysql_backup"]="origin/master"
+INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-simpleproxy"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-nodepool"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-openafs"]="origin/master"
 INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jenkins"]="origin/master"
diff --git a/modules/mysql_proxy/files/mysql-proxy b/modules/mysql_proxy/files/mysql-proxy
deleted file mode 100644
index b0f444881d..0000000000
--- a/modules/mysql_proxy/files/mysql-proxy
+++ /dev/null
@@ -1,2 +0,0 @@
-ENABLED="true"
-OPTIONS="--defaults-file /etc/mysql-proxy/mysql-proxy.conf"
diff --git a/modules/mysql_proxy/manifests/init.pp b/modules/mysql_proxy/manifests/init.pp
deleted file mode 100644
index 434522951a..0000000000
--- a/modules/mysql_proxy/manifests/init.pp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# == Class: mysql_proxy
-#
-class mysql_proxy {
-
-    package { 'mysql-proxy':
-      ensure => absent,
-    }
-
-    file { '/etc/mysql-proxy':
-      ensure  => absent,
-      recurse => true,
-      force   => true,
-    }
-
-    file { '/etc/default/mysql-proxy':
-      ensure => absent,
-    }
-
-    package { 'simpleproxy':
-      ensure => latest,
-    }
-
-}
diff --git a/modules/mysql_proxy/manifests/server.pp b/modules/mysql_proxy/manifests/server.pp
deleted file mode 100644
index be9057a63d..0000000000
--- a/modules/mysql_proxy/manifests/server.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# == Class: mysql_proxy::server
-#
-class mysql_proxy::server (
-  $db_host,
-  $db_port='3306',
-) {
-
-  file { '/etc/mysql-proxy/mysql-proxy.conf':
-    ensure  => absent,
-  }
-
-  file { "/etc/init.d/simpleproxy-mysql":
-    ensure  => present,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0555',
-    content => template('mysql_proxy/simpleproxy-mysql.init.erb'),
-    require => Package['simpleproxy']
-  }
-
-  service{ 'simpleproxy-mysql':
-    enable      => true,
-    hasrestart  => true,
-    require    => File["/etc/init.d/simpleproxy-mysql"],
-  }
-}
diff --git a/modules/mysql_proxy/templates/simpleproxy-mysql.init.erb b/modules/mysql_proxy/templates/simpleproxy-mysql.init.erb
deleted file mode 100644
index 043cc48831..0000000000
--- a/modules/mysql_proxy/templates/simpleproxy-mysql.init.erb
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /bin/sh
-#### BEGIN INIT INFO
-# Provides: simpleproxy-mysql
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Simpleproxy for MySQL
-# Description: TCP proxy to forward incoming MySQL connections
-### END INIT INFO
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
-DESC="Simpleproxy for MySQL"
-NAME=simpleproxy-mysql
-DAEMON=/usr/bin/simpleproxy
-DAEMON_ARGS="-L<%= @db_port %> -R <%= @db_host %>:<%= @db_port %> -d"
-SCRIPTNAME=/etc/init.d/$NAME
-USER=logstash
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-    # Return
-    #   0 if daemon has been started
-    #   1 if daemon was already running
-    #   2 if daemon could not be started
-
-    mkdir -p /var/run/$NAME
-    chown $USER /var/run/$NAME
-    start-stop-daemon --start --quiet -c $USER --exec $DAEMON --test > /dev/null \
-        || return 1
-    start-stop-daemon --start --quiet -c $USER --exec $DAEMON -- \
-        $DAEMON_ARGS \
-        || return 2
-    # Add code here, if necessary, that waits for the process to be ready
-    # to handle requests from services started subsequently which depend
-    # on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-    # Return
-    #   0 if daemon has been stopped
-    #   1 if daemon was already stopped
-    #   2 if daemon could not be stopped
-    #   other if a failure occurred
-    start-stop-daemon --stop --signal 9
-    RETVAL="$?"
-    [ "$RETVAL" = 2 ] && return 2
-    rm -f /var/run/$NAME/*
-    return "$RETVAL"
-}
-
-#
-# Function that stops the daemon/service
-#
-#do_graceful_stop()
-#{
-#   PID=`cat $PIDFILE`
-#   kill -USR1 $PID
-#
-#   # wait until really stopped
-#   if [ -n "${PID:-}" ]; then
-#       i=0
-#       while kill -0 "${PID:-}" 2> /dev/null;  do
-#           if [ $i -eq '0' ]; then
-#               echo -n " ... waiting "
-#           else
-#               echo -n "."
-#           fi
-#           i=$(($i+1))
-#           sleep 1
-#       done
-#   fi
-#
-#   rm -f /var/run/$NAME/*
-#}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-#do_reload() {
-#   #
-#   # If the daemon can reload its configuration without
-#   # restarting (for example, when it is sent a SIGHUP),
-#   # then implement that here.
-#   #
-#   start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name zuul- server
-#   return 0
-#}
-
-case "$1" in
-  start)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-    do_start
-    case "$?" in
-        0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-        2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-    ;;
-  stop)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-    do_stop
-    case "$?" in
-        0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-        2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-    ;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-#  reload)
-#   #
-#   # If do_reload() is not implemented then leave this commented out
-#   # and leave 'force-reload' as an alias for 'restart'.
-#   #
-#   log_daemon_msg "Reloading $DESC" "$NAME"
-#   do_reload
-#   log_end_msg $?
-#   ;;
-  restart|force-reload)
-    #
-    # If the "reload" option is implemented then remove the
-    # 'force-reload' alias
-    #
-    log_daemon_msg "Restarting $DESC" "$NAME"
-    do_stop
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-    exit 3
-    ;;
-esac
-
-:
-
diff --git a/modules/openstack_project/manifests/logstash.pp b/modules/openstack_project/manifests/logstash.pp
index 642b8f806e..4584515d4e 100644
--- a/modules/openstack_project/manifests/logstash.pp
+++ b/modules/openstack_project/manifests/logstash.pp
@@ -53,9 +53,9 @@ class openstack_project::logstash (
     db_pass => $subunit2sql_db_pass,
   }
 
-  include 'mysql_proxy'
+  include 'simpleproxy'
 
-  class { 'mysql_proxy::server':
+  class { 'simpleproxy::server':
     db_host            => $subunit2sql_db_host,
   }
 }