From 03faa403cfe65646722d361bf13bd21ddef86269 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 2 Aug 2016 13:34:02 +0100
Subject: [PATCH] Add ability to change apt/yum package state

The current method of installing the distribution packages required is
set in the tasks and cannot be changed by a deployer.

Currently the apt task always installs the latest package. This results
in unexpected binary changes when a deployer may simply be trying to
execute a configuration change.

This patch adds the ability for a deployer to change the desired state
so that the results are predictable.

Change-Id: Iffdca41860b1b800aab21bc71bf4598558494f73
---
 defaults/main.yml                                   |  3 +++
 .../notes/package-state-7caea8f1db708a2e.yaml       | 13 +++++++++++++
 tasks/cinder_install_apt.yml                        |  6 +++---
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/package-state-7caea8f1db708a2e.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index ccc5f70b..babcf251 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Set the package install state for distribution packages
+# Options are 'present' and 'latest'
+cinder_package_state: "latest"
 
 cinder_git_repo: https://git.openstack.org/openstack/cinder
 cinder_git_install_branch: master
diff --git a/releasenotes/notes/package-state-7caea8f1db708a2e.yaml b/releasenotes/notes/package-state-7caea8f1db708a2e.yaml
new file mode 100644
index 00000000..890ffcbd
--- /dev/null
+++ b/releasenotes/notes/package-state-7caea8f1db708a2e.yaml
@@ -0,0 +1,13 @@
+---
+features:
+  - The os_cinder role now supports the ability to configure whether
+    apt/yum tasks install the latest available package, or just ensure
+    that the package is present. The default action is to ensure that
+    the latest package is present. The action taken may be changed to
+    only ensure that the package is present by setting
+    ``cinder_package_state`` to ``present``.
+upgrade:
+  - The os_cinder role always checks whether the latest package is
+    installed when executed. If a deployer wishes to change the check to
+    only validate the presence of the package, the option
+    ``cinder_package_state`` should be set to ``present``.
diff --git a/tasks/cinder_install_apt.yml b/tasks/cinder_install_apt.yml
index e88ced20..08ee10bd 100644
--- a/tasks/cinder_install_apt.yml
+++ b/tasks/cinder_install_apt.yml
@@ -29,7 +29,7 @@
 - name: Install apt packages
   apt:
     pkg: "{{ item }}"
-    state: latest
+    state: "{{ cinder_package_state }}"
   register: install_packages
   until: install_packages|success
   retries: 5
@@ -39,7 +39,7 @@
 - name: Install apt packages common between different backends
   apt:
     pkg: "{{ item }}"
-    state: latest
+    state: "{{ cinder_package_state }}"
   register: install_packages
   until: install_packages|success
   retries: 5
@@ -51,7 +51,7 @@
 - name: Install apt packages for LVM backend
   apt:
     pkg: "{{ item }}"
-    state: latest
+    state: "{{ cinder_package_state }}"
   register: install_packages
   until: install_packages|success
   retries: 5