diff --git a/rpc_deployment/playbooks/openstack/openstack-common.yml b/rpc_deployment/playbooks/openstack/openstack-common.yml
deleted file mode 100644
index 350ca0f240..0000000000
--- a/rpc_deployment/playbooks/openstack/openstack-common.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# 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.
-
-- hosts: glance_all:cinder_all
-  user: root
-  roles:
-    - common
-    - container_common
-    - openstack_common
-    - openstack_openrc
diff --git a/rpc_deployment/playbooks/openstack/openstack-setup.yml b/rpc_deployment/playbooks/openstack/openstack-setup.yml
index 96b5d58e50..f78484178e 100644
--- a/rpc_deployment/playbooks/openstack/openstack-setup.yml
+++ b/rpc_deployment/playbooks/openstack/openstack-setup.yml
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: openstack-common.yml
 - include: keystone-all.yml
 - include: glance-all.yml
 - include: heat-all.yml