Use the apt_package_pinning role
Add a dependency on the apt_package_pinning role and use it, instead of a template within this role, to pin the MariaDB repo. Change-Id: I26111d7191db793b9cddca29c681399040ab6011
This commit is contained in:
@@ -33,6 +33,8 @@ galera_client_drop_config_file: "{{ inventory_hostname in groups['galera_all'] o
|
||||
galera_client_apt_repo_url: "https://mirror.rackspace.com/mariadb/repo/10.0/ubuntu"
|
||||
galera_client_apt_repo: "deb {{ galera_client_apt_repo_url }} {{ ansible_distribution_release }} main"
|
||||
|
||||
galera_apt_pinned_packages: [{ package: "*", release: MariaDB, priority: "1001" }]
|
||||
|
||||
galera_client_pip_packages:
|
||||
- MySQL-python
|
||||
- python-memcached
|
||||
|
||||
@@ -30,4 +30,9 @@ galaxy_info:
|
||||
- development
|
||||
- openstack
|
||||
dependencies:
|
||||
- role: apt_package_pinning
|
||||
apt_pinned_packages: "{{ galera_apt_pinned_packages }}"
|
||||
apt_package_pinning_file_name: "galera_client_pin.pref"
|
||||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
- pip_install
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- The Galera client role now has a dependency on the
|
||||
apt package pinning role.
|
||||
@@ -49,16 +49,6 @@
|
||||
tags:
|
||||
- galera-client-apt-keys
|
||||
|
||||
- name: Drop galera repo pin
|
||||
template:
|
||||
src: "galera_client_pin.pref.j2"
|
||||
dest: "/etc/apt/preferences.d/galera_client_pin.pref"
|
||||
owner: "root"
|
||||
group: "root"
|
||||
mode: "0644"
|
||||
tags:
|
||||
- galera-client-repo-pin
|
||||
|
||||
- name: Add galera repo(s)
|
||||
apt_repository:
|
||||
repo: "{{ galera_client_apt_repo }}"
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
# {{ ansible_managed }}
|
||||
|
||||
Package: *
|
||||
Pin: release o=MariaDB
|
||||
Pin-Priority: 1001
|
||||
@@ -1,3 +1,7 @@
|
||||
- name: apt_package_pinning
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
|
||||
scm: git
|
||||
version: master
|
||||
- name: pip_install
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-pip_install
|
||||
scm: git
|
||||
|
||||
Reference in New Issue
Block a user