diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml
index 7453df51c9..f73acfec75 100644
--- a/etc/openstack_deploy/user_variables.yml
+++ b/etc/openstack_deploy/user_variables.yml
@@ -60,3 +60,14 @@ ssl_cipher_suite: "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AE
 # To override for Horizon only:
 #   - horizon_ssl_protocol
 #   - horizon_ssl_cipher_suite
+
+## Additional pinning generator that will allow for more packages to be pinned as you see fit.
+## All pins allow for package and versions to be defined. Be careful using this as versions
+## are always subject to change and updates regarding security will become your problem from this
+## point on. Pinning can be done based on a package version, release, or origin. Use "*" in the
+## package name to indicate that you want to pin all package to a particular constraint.
+# apt_pinned_packages:
+#   - { package: "lxc", version: "1.0.7-0ubuntu0.1" }
+#   - { package: "libvirt-bin", version: "1.2.2-0ubuntu13.1.9" }
+#   - { package: "rabbitmq-server", origin: "www.rabbitmq.com" }
+#   - { package: "*", release: "MariaDB" }
diff --git a/playbooks/roles/apt_package_pinning/LICENSE b/playbooks/roles/apt_package_pinning/LICENSE
new file mode 100644
index 0000000000..e06d208186
--- /dev/null
+++ b/playbooks/roles/apt_package_pinning/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.
+
diff --git a/playbooks/roles/apt_package_pinning/README.rst b/playbooks/roles/apt_package_pinning/README.rst
new file mode 100644
index 0000000000..bf9c3cf082
--- /dev/null
+++ b/playbooks/roles/apt_package_pinning/README.rst
@@ -0,0 +1,22 @@
+Pin apt packages
+################
+:tags: openstack, apt, pinning, cloud, ansible
+:category: \*nix
+
+Role for pinning apt packages.
+
+Example Ansible play
+
+.. code-block:: yaml
+
+    - name: Pin packages on all "hosts"
+      hosts: hosts
+      user: root
+      roles:
+        - { role: "apt_package_pinning", tags: [ "apt-package-pinning" ] }
+      vars:
+        apt_pinned_packages:
+          - { package: "lxc", version: "1.0.7-0ubuntu0.1" }
+          - { package: "libvirt-bin", version: "1.2.2-0ubuntu13.1.9" }
+          - { package: "rabbitmq-server", origin: "www.rabbitmq.com" }
+          - { package: "*", release: "MariaDB" }
diff --git a/playbooks/roles/apt_package_pinning/defaults/main.yml b/playbooks/roles/apt_package_pinning/defaults/main.yml
new file mode 100644
index 0000000000..02aff9482f
--- /dev/null
+++ b/playbooks/roles/apt_package_pinning/defaults/main.yml
@@ -0,0 +1,16 @@
+---
+# 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.
+
+apt_package_pinning_priority: 900
diff --git a/playbooks/roles/apt_package_pinning/meta/main.yml b/playbooks/roles/apt_package_pinning/meta/main.yml
new file mode 100644
index 0000000000..6ee7366707
--- /dev/null
+++ b/playbooks/roles/apt_package_pinning/meta/main.yml
@@ -0,0 +1,32 @@
+---
+# 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.
+
+galaxy_info:
+  author: rcbops
+  description: Pinning of apt packages
+  company: Rackspace
+  license: Apache2
+  min_ansible_version: 1.6.6
+  platforms:
+    - name: Ubuntu
+      versions:
+        - trusty
+  categories:
+    - cloud
+    - apt
+    - pinning
+    - development
+    - openstack
+dependencies: []
diff --git a/playbooks/roles/apt_package_pinning/tasks/main.yml b/playbooks/roles/apt_package_pinning/tasks/main.yml
new file mode 100644
index 0000000000..dc969fe1d6
--- /dev/null
+++ b/playbooks/roles/apt_package_pinning/tasks/main.yml
@@ -0,0 +1,20 @@
+---
+# 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.
+
+- name: Add apt pin preferences
+  template:
+    src: apt_pinned_packages.perf.j2
+    dest: /etc/apt/preferences.d/openstack_pinned_packages.pref
+  when: apt_pinned_packages is defined
diff --git a/playbooks/roles/apt_package_pinning/templates/apt_pinned_packages.perf.j2 b/playbooks/roles/apt_package_pinning/templates/apt_pinned_packages.perf.j2
new file mode 100644
index 0000000000..c48fe9edb2
--- /dev/null
+++ b/playbooks/roles/apt_package_pinning/templates/apt_pinned_packages.perf.j2
@@ -0,0 +1,23 @@
+# {{ ansible_managed }}
+
+{% for item in apt_pinned_packages %}
+
+{% if item.version is defined %}
+Package: {{ item.package }}
+Pin: version {{ item.version }}
+Pin-Priority: {{ item.priority | default(apt_package_pinning_priority) }}
+{% endif %}
+
+{% if item.origin is defined %}
+Package: {{ item.package }}
+Pin: origin {{ item.origin }}
+Pin-Priority: {{ item.priority | default(apt_package_pinning_priority) }}
+{% endif %}
+
+{% if item.release is defined %}
+Package: {{ item.package }}
+Pin: release o={{ item.release }}
+Pin-Priority: {{ item.priority | default(apt_package_pinning_priority) }}
+{% endif %}
+
+{% endfor %}
diff --git a/playbooks/roles/galera_server/meta/main.yml b/playbooks/roles/galera_server/meta/main.yml
index 7f03cca969..8c49274985 100644
--- a/playbooks/roles/galera_server/meta/main.yml
+++ b/playbooks/roles/galera_server/meta/main.yml
@@ -30,4 +30,5 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - galera_client
diff --git a/playbooks/roles/haproxy_server/meta/main.yml b/playbooks/roles/haproxy_server/meta/main.yml
index a42b9905f3..cbcc43fc16 100644
--- a/playbooks/roles/haproxy_server/meta/main.yml
+++ b/playbooks/roles/haproxy_server/meta/main.yml
@@ -28,4 +28,5 @@ galaxy_info:
     - python
     - development
     - openstack
-dependencies: []
+dependencies:
+  - apt_package_pinning
diff --git a/playbooks/roles/lxc_hosts/meta/main.yml b/playbooks/roles/lxc_hosts/meta/main.yml
index c65a663a77..f18ace7085 100644
--- a/playbooks/roles/lxc_hosts/meta/main.yml
+++ b/playbooks/roles/lxc_hosts/meta/main.yml
@@ -29,4 +29,5 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - pip_install
diff --git a/playbooks/roles/memcached_server/meta/main.yml b/playbooks/roles/memcached_server/meta/main.yml
index 80c41514f7..42203d67a2 100644
--- a/playbooks/roles/memcached_server/meta/main.yml
+++ b/playbooks/roles/memcached_server/meta/main.yml
@@ -28,4 +28,5 @@ galaxy_info:
     - memcached
     - development
     - openstack
-dependencies: []
+dependencies:
+  - apt_package_pinning
diff --git a/playbooks/roles/openstack_hosts/meta/main.yml b/playbooks/roles/openstack_hosts/meta/main.yml
index 0960806654..f9d7c1b5aa 100644
--- a/playbooks/roles/openstack_hosts/meta/main.yml
+++ b/playbooks/roles/openstack_hosts/meta/main.yml
@@ -28,4 +28,5 @@ galaxy_info:
     - host
     - development
     - openstack
-dependencies: []
+dependencies:
+  - apt_package_pinning
diff --git a/playbooks/roles/os_cinder/meta/main.yml b/playbooks/roles/os_cinder/meta/main.yml
index 8ab30f4cee..8c4b947b34 100644
--- a/playbooks/roles/os_cinder/meta/main.yml
+++ b/playbooks/roles/os_cinder/meta/main.yml
@@ -30,6 +30,7 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - galera_client
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/os_glance/meta/main.yml b/playbooks/roles/os_glance/meta/main.yml
index 0f4bfb7899..a789f78422 100644
--- a/playbooks/roles/os_glance/meta/main.yml
+++ b/playbooks/roles/os_glance/meta/main.yml
@@ -30,6 +30,7 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - galera_client
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/os_heat/meta/main.yml b/playbooks/roles/os_heat/meta/main.yml
index 51666637ca..b48a7a2fec 100644
--- a/playbooks/roles/os_heat/meta/main.yml
+++ b/playbooks/roles/os_heat/meta/main.yml
@@ -30,6 +30,7 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - galera_client
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/os_horizon/meta/main.yml b/playbooks/roles/os_horizon/meta/main.yml
index 51866b1e8a..0348931868 100644
--- a/playbooks/roles/os_horizon/meta/main.yml
+++ b/playbooks/roles/os_horizon/meta/main.yml
@@ -30,6 +30,7 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - galera_client
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/os_keystone/meta/main.yml b/playbooks/roles/os_keystone/meta/main.yml
index f2d66cb77d..b81945f0a7 100644
--- a/playbooks/roles/os_keystone/meta/main.yml
+++ b/playbooks/roles/os_keystone/meta/main.yml
@@ -30,6 +30,7 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - galera_client
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/os_neutron/meta/main.yml b/playbooks/roles/os_neutron/meta/main.yml
index fc91881069..91cc7231ef 100644
--- a/playbooks/roles/os_neutron/meta/main.yml
+++ b/playbooks/roles/os_neutron/meta/main.yml
@@ -30,6 +30,7 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - galera_client
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/os_nova/meta/main.yml b/playbooks/roles/os_nova/meta/main.yml
index f96db97fc8..f0a85d903a 100644
--- a/playbooks/roles/os_nova/meta/main.yml
+++ b/playbooks/roles/os_nova/meta/main.yml
@@ -30,6 +30,7 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - galera_client
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/os_swift/meta/main.yml b/playbooks/roles/os_swift/meta/main.yml
index 800551c48c..4430fbff02 100644
--- a/playbooks/roles/os_swift/meta/main.yml
+++ b/playbooks/roles/os_swift/meta/main.yml
@@ -30,5 +30,6 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/os_tempest/meta/main.yml b/playbooks/roles/os_tempest/meta/main.yml
index 84b70a5a3f..8f1f2dc3b5 100644
--- a/playbooks/roles/os_tempest/meta/main.yml
+++ b/playbooks/roles/os_tempest/meta/main.yml
@@ -30,5 +30,6 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - openstack_openrc
   - pip_lock_down
diff --git a/playbooks/roles/rabbitmq_server/meta/main.yml b/playbooks/roles/rabbitmq_server/meta/main.yml
index 93d57f7ed2..003182cbd9 100644
--- a/playbooks/roles/rabbitmq_server/meta/main.yml
+++ b/playbooks/roles/rabbitmq_server/meta/main.yml
@@ -29,4 +29,5 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - pip_lock_down
diff --git a/playbooks/roles/repo_server/meta/main.yml b/playbooks/roles/repo_server/meta/main.yml
index 55e298b75a..ba9696f9bb 100644
--- a/playbooks/roles/repo_server/meta/main.yml
+++ b/playbooks/roles/repo_server/meta/main.yml
@@ -29,5 +29,6 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - apt_package_pinning
   - pip_install
   - memcached_server
diff --git a/playbooks/roles/rsyslog_server/meta/main.yml b/playbooks/roles/rsyslog_server/meta/main.yml
index d52cdce8a7..32e9f904e2 100644
--- a/playbooks/roles/rsyslog_server/meta/main.yml
+++ b/playbooks/roles/rsyslog_server/meta/main.yml
@@ -28,4 +28,5 @@ galaxy_info:
     - rsyslog
     - development
     - openstack
-dependencies: []
+dependencies:
+  - apt_package_pinning