Rename package lists (and related vars) appropriately

In order to make it easier to differentiate between the lists of
python packages, distribution packages, downloaded packages,
package pins and other similar variables the variable names are
being changed to ensure that they have a more explicit suffix
that defines the purpose and makes the naming more consistent.

This is to facilitate a lookup plugin which will be able to look
up all the package lists and present them as a consolidated piece
of data which may be used for artifact preparation.

Change-Id: I9fd9e3ca1aec2d76cd78c4013bbb85c189e2d5e5

defaults/main.yml

@@ -26,7 +26,7 @@ galera_client_package_state: "latest"
 
 galera_client_drop_config_file: false
 
-galera_pinned_packages: []
+galera_client_distro_package_pins: []
 
 galera_client_pip_packages:
   - MySQL-python

meta/main.yml

@@ -35,7 +35,7 @@ galaxy_info:
     - openstack
 dependencies:
   - role: apt_package_pinning
-    apt_pinned_packages: "{{ galera_pinned_packages }}"
+    apt_pinned_packages: "{{ galera_client_distro_package_pins }}"
     apt_package_pinning_file_name: "galera_client_pin.pref"
     when:
       - ansible_pkg_mgr == 'apt'

releasenotes/notes/multi-distro-add-0e53560f66394691.yaml

@@ -1,12 +1,6 @@
 ---
 features:
   - CentOS 7 support has been added to the ``galera_client`` role.
-deprecations:
-  - The variable **galera_client_apt_packages** has been deprecated
-    when deploying the ``galera_client`` role on Ubuntu 14.04. This
-    variable has been replaced with **galera_client_packages** and
-    will be removed in the Ocata release.
-  - The variable **galera_apt_pinned_packages** has been deprecated
-    when deploying the ``galera_client`` role on Ubuntu 14.04. This
-    variable has been replaced with **galera_pinned_packages**
-    and will be removed in the Ocata release.
+upgrade:
+  - The variable ``galera_client_apt_packages`` has been replaced
+    by ``galera_client_distro_packages``.

tasks/galera_client_install_apt.yml

@@ -96,6 +96,6 @@
   until: install_packages | success
   retries: 5
   delay: 2
-  with_items: "{{ galera_client_packages }}"
+  with_items: "{{ galera_client_distro_packages }}"
   tags:
     - galera-client-apt-packages

tasks/galera_client_install_yum.yml

@@ -86,6 +86,6 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  with_items: "{{ galera_client_packages }}"
+  with_items: "{{ galera_client_distro_packages }}"
   tags:
     - galera-pre-yum-packages

vars/redhat-7.yml

@@ -22,7 +22,7 @@ galera_client_repo:
   baseurl: "{{ galera_client_yum_repo_url }}"
   gpgkey: "https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
 
-galera_client_packages:
+galera_client_distro_packages:
   - bzip2-devel
   - gcc
   - gnupg2

vars/ubuntu-14.04.yml

@@ -17,7 +17,7 @@
 galera_client_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.0/ubuntu"
 galera_client_repo: "deb {{ galera_client_apt_repo_url }} {{ ansible_distribution_release }} main"
 
-_galera_client_packages:
+galera_client_distro_packages:
   - build-essential
   - libaio1
   - libc6
@@ -30,12 +30,6 @@ _galera_client_packages:
   - mariadb-client
   - mariadb-client-core-10.0
   - python-dev
-galera_client_packages: >
-  {{ _galera_client_packages | deprecated(galera_client_apt_packages,
-                                          "galera_client_apt_packages",
-                                          "galera_client_packages",
-                                          "Ocata",
-                                          galera_client_fatal_deprecations) }}
 
 # Galera GPG Keys
 galera_client_gpg_keys:
@@ -44,10 +38,4 @@ galera_client_gpg_keys:
     fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
     hash_id: '0xcbcb082a1bb943db'
 
-_galera_pinned_packages: [{ package: "*", release: MariaDB, priority: "1001" }]
-galera_pinned_packages: >
-  {{ _galera_pinned_packages | deprecated(galera_apt_pinned_packages,
-                                          "galera_apt_pinned_packages",
-                                          "galera_pinned_packages",
-                                          "Ocata",
-                                          galera_client_fatal_deprecations) }}
+galera_client_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }]

vars/ubuntu-16.04.yml

@@ -17,7 +17,7 @@
 galera_client_apt_repo_url: "http://mirror.rackspace.com/mariadb/repo/10.0/ubuntu"
 galera_client_repo: "deb {{ galera_client_apt_repo_url }} {{ ansible_distribution_release }} main"
 
-galera_client_packages:
+galera_client_distro_packages:
   - build-essential
   - libaio1
   - libc6
@@ -38,4 +38,4 @@ galera_client_gpg_keys:
     fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
     hash_id: '0xF1656F24C74CD1D8'
 
-galera_pinned_packages: [{ package: "*", release: MariaDB, priority: "1001" }]
+galera_client_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }]