diff --git a/manifests/objectstore.pp b/manifests/objectstore.pp
deleted file mode 100644
index 03a46731a..000000000
--- a/manifests/objectstore.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-# == Class: nova::objectstore
-#
-# Manages the nova-objectstore service
-#
-# === Parameters:
-#
-# [*enabled*]
-#   (optional) Whether to enable the service
-#   Defaults to true
-#
-# [*manage_service*]
-#   (optional) Whether to start/stop the service
-#   Defaults to true
-#
-# [*ensure_package*]
-#   (optional) The package state to set
-#   Defaults to 'present'
-#
-# [*bind_address*]
-#   (optional) The address to bind to
-#   Defaults to '0.0.0.0'
-#
-class nova::objectstore(
-  $enabled        = true,
-  $manage_service = true,
-  $ensure_package = 'present',
-  $bind_address   = '0.0.0.0'
-) {
-
-  include ::nova::deps
-  include ::nova::params
-
-  nova::generic_service { 'objectstore':
-    enabled        => $enabled,
-    manage_service => $manage_service,
-    package_name   => $::nova::params::objectstore_package_name,
-    service_name   => $::nova::params::objectstore_service_name,
-    ensure_package => $ensure_package,
-  }
-
-  nova_config {
-    'DEFAULT/s3_listen':  value => $bind_address;
-  }
-}
diff --git a/manifests/params.pp b/manifests/params.pp
index cb601aaf9..c27954148 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -21,7 +21,6 @@ class nova::params {
       $libvirt_daemon_package_prefix = 'libvirt-daemon-'
       $libvirt_nwfilter_package_name = 'libvirt-daemon-config-nwfilter'
       $network_package_name          = 'openstack-nova-network'
-      $objectstore_package_name      = 'openstack-nova-objectstore'
       $scheduler_package_name        = 'openstack-nova-scheduler'
       $tgt_package_name              = 'scsi-target-utils'
       $vncproxy_package_name         = 'openstack-nova-novncproxy'
@@ -40,7 +39,6 @@ class nova::params {
       $virtlock_service_name         = 'virtlockd'
       $virtlog_service_name          = undef
       $network_service_name          = 'openstack-nova-network'
-      $objectstore_service_name      = 'openstack-nova-objectstore'
       $scheduler_service_name        = 'openstack-nova-scheduler'
       $tgt_service_name              = 'tgtd'
       $vncproxy_service_name         = 'openstack-nova-novncproxy'
@@ -88,7 +86,6 @@ class nova::params {
       $doc_package_name             = 'nova-doc'
       $libvirt_package_name         = 'libvirt-bin'
       $network_package_name         = 'nova-network'
-      $objectstore_package_name     = 'nova-objectstore'
       $scheduler_package_name       = 'nova-scheduler'
       $tgt_package_name             = 'tgt'
       $serialproxy_package_name     = 'nova-serialproxy'
@@ -102,7 +99,6 @@ class nova::params {
       $conductor_service_name       = 'nova-conductor'
       $consoleauth_service_name     = 'nova-consoleauth'
       $network_service_name         = 'nova-network'
-      $objectstore_service_name     = 'nova-objectstore'
       $scheduler_service_name       = 'nova-scheduler'
       $vncproxy_service_name        = 'nova-novncproxy'
       $serialproxy_service_name     = 'nova-serialproxy'
diff --git a/releasenotes/notes/remove-nova-objectstore-options-20059f3096c168db.yaml b/releasenotes/notes/remove-nova-objectstore-options-20059f3096c168db.yaml
new file mode 100644
index 000000000..2b66a7d11
--- /dev/null
+++ b/releasenotes/notes/remove-nova-objectstore-options-20059f3096c168db.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - Removed nova-objectstore service config options, this service has been remove since Mitaka.
+
diff --git a/spec/classes/nova_objectstore_spec.rb b/spec/classes/nova_objectstore_spec.rb
deleted file mode 100644
index 4be11e22a..000000000
--- a/spec/classes/nova_objectstore_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'spec_helper'
-
-describe 'nova::objectstore' do
-
-  let :pre_condition do
-    'include nova'
-  end
-
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
-    end
-
-    it_behaves_like 'generic nova service', {
-      :name         => 'nova-objectstore',
-      :package_name => 'nova-objectstore',
-      :service_name => 'nova-objectstore' }
-    it { is_expected.to contain_nova_config('DEFAULT/s3_listen').with_value('0.0.0.0') }
-
-    context 'with custom bind parameter' do
-      let :params do
-        { :bind_address => '192.168.0.1'}
-      end
-      it { is_expected.to contain_nova_config('DEFAULT/s3_listen').with_value('192.168.0.1') }
-    end
-
-  end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-
-    it_behaves_like 'generic nova service', {
-      :name         => 'nova-objectstore',
-      :package_name => 'openstack-nova-objectstore',
-      :service_name => 'openstack-nova-objectstore' }
-    it { is_expected.to contain_nova_config('DEFAULT/s3_listen').with_value('0.0.0.0')}
-
-    context 'with custom bind parameter' do
-      let :params do
-        { :bind_address => '192.168.0.1'}
-      end
-      it { is_expected.to contain_nova_config('DEFAULT/s3_listen').with_value('192.168.0.1') }
-    end
-
-  end
-end