diff --git a/defaults/main.yml b/defaults/main.yml index 580fe5a..104ef89 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/meta/main.yml b/meta/main.yml index 74f4e8b..068b802 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -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 diff --git a/releasenotes/notes/apt-package-pinning-dependency-6e2e94d829508859.yaml b/releasenotes/notes/apt-package-pinning-dependency-6e2e94d829508859.yaml new file mode 100644 index 0000000..e24eac1 --- /dev/null +++ b/releasenotes/notes/apt-package-pinning-dependency-6e2e94d829508859.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - The Galera client role now has a dependency on the + apt package pinning role. diff --git a/tasks/galera_client_pre_install.yml b/tasks/galera_client_pre_install.yml index 7961feb..71a5845 100644 --- a/tasks/galera_client_pre_install.yml +++ b/tasks/galera_client_pre_install.yml @@ -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 }}" diff --git a/templates/galera_client_pin.pref.j2 b/templates/galera_client_pin.pref.j2 deleted file mode 100644 index 0d2a6e5..0000000 --- a/templates/galera_client_pin.pref.j2 +++ /dev/null @@ -1,5 +0,0 @@ -# {{ ansible_managed }} - -Package: * -Pin: release o=MariaDB -Pin-Priority: 1001 diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 30367e9..3575966 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -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