openstack/openstack-ansible-galera_server
Code Issues Proposed changes

Rename package lists (and related vars) appropriately

Browse Source 
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: Iba040bf8da6ec0552fcf7d10022094dc57d312bc
This commit is contained in:
Jesse Pretorius 2016-08-26 15:39:52 +01:00
parent 885aefaa19
commit 3df31ce349
8 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -35,9 +35,9 @@ galera_cluster_name: openstack_galera_cluster
# These are here to stub out the internal ROLE API.
# if these are used they should be set within the
# distro specific variable files found in vars/
galera_pinned_packages: []
galera_server_distro_package_pins: []
galera_debconf_items: []
percona_upstream_packages: []
galera_server_percona_distro_packages: []
galera_existing_cluster: true

2
meta/main.yml
View File

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

6
releasenotes/notes/package-list-name-changes-7fcd5583f0db0eb6.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- The variable ``galera_pre_packages`` has been renamed to
``galera_server_required_distro_packages``.
- The variable ``galera_packages`` has been renamed to
``galera_server_mariadb_distro_packages``.

6
tasks/galera_install_apt.yml
View File

@ -38,7 +38,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ galera_pre_packages }}"
with_items: "{{ galera_server_required_distro_packages }}"
tags:
- galera-pre-apt-packages
@ -146,7 +146,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ galera_packages }}"
with_items: "{{ galera_server_mariadb_distro_packages }}"
notify: Restart mysql
tags:
- galera-apt-packages
@ -171,7 +171,7 @@
apt:
pkg: "{{ item }}"
state: installed
with_items: "{{ percona_upstream_packages }}"
with_items: "{{ galera_server_percona_distro_packages }}"
when: use_percona_upstream | bool
tags:
- percona-apt-packages

6
tasks/galera_install_yum.yml
View File

@ -86,7 +86,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ galera_pre_packages }}"
with_items: "{{ galera_server_required_distro_packages }}"
tags:
- galera-pre-yum-packages
@ -110,7 +110,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ percona_upstream_packages }}"
with_items: "{{ galera_server_percona_distro_packages }}"
when: use_percona_upstream | bool
tags:
- galera-pre-yum-packages
@ -123,7 +123,7 @@
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ galera_packages }}"
with_items: "{{ galera_server_mariadb_distro_packages }}"
tags:
- galera-pre-yum-packages

6
vars/redhat-7.yml
View File

@ -19,7 +19,7 @@ galera_gpg_keys:
keyserver: 'https://yum.mariadb.org'
fallback_keyserver: 'https://yum.mariadb.org'
galera_pre_packages:
galera_server_required_distro_packages:
- gnupg2
- libaio
- libstdc++
@ -34,7 +34,7 @@ percona_package_download_validate_certs: "yes"
galera_mariadb_yum_server_package: "MariaDB-Galera-server"
galera_packages:
galera_server_mariadb_distro_packages:
- which
- "{{ galera_mariadb_yum_server_package }}"
- MariaDB-shared
@ -56,7 +56,7 @@ galera_percona_xtrabackup_repo:
repo: "http://www.percona.com/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm"
state: "present"
percona_upstream_packages:
galera_server_percona_distro_packages:
- qpress
- percona-xtrabackup

15
vars/ubuntu-14.04.yml
View File

@ -16,7 +16,7 @@
## APT Cache Options
cache_timeout: 600
galera_pinned_packages: [{ package: "*", release: MariaDB, priority: "1001" }]
galera_server_distro_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }]
# Galera GPG Keys
galera_gpg_keys:
@ -29,7 +29,7 @@ galera_gpg_keys:
fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
hash_id: '0x1c4cbdcdcd2efd2a'
galera_pre_packages:
galera_server_required_distro_packages:
- apt-transport-https
- debconf-utils
- libaio1
@ -46,10 +46,11 @@ galera_pre_packages:
# "galera_common" role.
galera_mariadb_apt_server_package: "mariadb-galera-server-10.0"
# NB This is specifically galera_packages as these packages only get installed
# during the galera play - this is because of the preseed task and the service
# startup control used when installing mariadb-galera-server and galera.
galera_packages:
# NB This is specifically galera_server_mariadb_distro_packages as these
# packages only get installed during the galera play - this is because of
# the preseed task and the service startup control used when installing
# mariadb-galera-server and galera.
galera_server_mariadb_distro_packages:
- mariadb-client
- "{{ galera_mariadb_apt_server_package }}"
- galera-3
@ -66,7 +67,7 @@ galera_debconf_items:
value: "{{ galera_root_password }}"
vtype: "string"
percona_upstream_packages:
galera_server_percona_distro_packages:
- qpress
- percona-xtrabackup

15
vars/ubuntu-16.04.yml
View File

@ -16,7 +16,7 @@
## APT Cache Options
cache_timeout: 600
galera_pinned_packages: [{ package: "*", release: MariaDB, priority: "1001" }]
galera_server_distro_package_pins: [{ package: "*", release: MariaDB, priority: "1001" }]
# Galera GPG Keys
galera_gpg_keys:
@ -29,7 +29,7 @@ galera_gpg_keys:
fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
hash_id: '0x1c4cbdcdcd2efd2a'
galera_pre_packages:
galera_server_required_distro_packages:
- apt-transport-https
- debconf-utils
- libaio1
@ -46,10 +46,11 @@ galera_pre_packages:
# "galera_common" role.
galera_mariadb_apt_server_package: "mariadb-galera-server-10.0"
# NB This is specifically galera_packages as these packages only get installed
# during the galera play - this is because of the preseed task and the service
# startup control used when installing mariadb-galera-server and galera.
galera_packages:
# NB This is specifically galera_server_mariadb_distro_packages as these
# packages only get installed during the galera play - this is because of
# the preseed task and the service startup control used when installing
# mariadb-galera-server and galera.
galera_server_mariadb_distro_packages:
- mariadb-client
- "{{ galera_mariadb_apt_server_package }}"
- galera-3
@ -66,7 +67,7 @@ galera_debconf_items:
value: "{{ galera_root_password }}"
vtype: "string"
percona_upstream_packages:
galera_server_percona_distro_packages:
- qpress
- percona-xtrabackup