Merge pull request #13 from Oefenweb/pr-11

Add support Percona Client 8.0

.ansible-lint

@@ -1,4 +1,5 @@
 ---
 warn_list:
  - role-name
+ - name[play]
  - name[casing]

.github/workflows/ci.yml

@@ -23,7 +23,9 @@ jobs:
  python-version: '3.x'
 
  - name: Install test dependencies
- run: pip install ansible-lint[community,yamllint]
+ run: |
+ pip install ansible-lint
+ ansible-galaxy install -r requirements.yml
 
  - name: Lint code
  run: |
@@ -43,11 +45,8 @@ jobs:
  matrix:
  include:
  - distro: debian8
- ansible-version: '<2.10'
  - distro: debian9
  - distro: debian10
- - distro: ubuntu1604
- ansible-version: '>=2.9, <2.10'
  - distro: ubuntu1604
  ansible-version: '>=2.10, <2.11'
  - distro: ubuntu1604

Dockerfile

@@ -1,17 +1,20 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Mischa ter Smitten <[email protected]>
 
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
 # python
 RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y python3-minimal python3-dev curl && \
  apt-get clean
-RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python -
+RUN curl -sL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 -
 RUN rm -rf $HOME/.cache
 
 # ansible
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-apt && \
  apt-get clean
-RUN pip install ansible==2.9.15
+RUN pip3 install ansible==2.10.7
 RUN rm -rf $HOME/.cache
 
 # provision

meta/main.yml

@@ -7,7 +7,7 @@ galaxy_info:
  company: Oefenweb.nl B.V.
  description: Set up percona-server client in Debian-like systems
  license: MIT
- min_ansible_version: 2.9.0
+ min_ansible_version: 2.10.0
  platforms:
  - name: Ubuntu
  versions:

molecule/default/collections.yml

@@ -0,0 +1,6 @@
+---
+collections:
+ - name: community.docker
+ version: '>=1.2.0,<2'
+ - name: community.general
+ version: '>=2,<3'

molecule/default/molecule.yml

@@ -8,7 +8,9 @@ platforms:
  image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
  command: ${MOLECULE_DOCKER_COMMAND:-""}
  volumes:
- - /sys/fs/cgroup:/sys/fs/cgroup:ro
+ - /sys/fs/cgroup:/sys/fs/cgroup:rw
+ - /var/lib/containerd
+ cgroupns_mode: host
  privileged: true
  pre_build_image: true
 provisioner:

requirements.yml

@@ -0,0 +1,3 @@
+# requirements file
+---
+collections: []

tasks/configure.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: configure | copy certificate files
- copy:
+ ansible.builtin.copy:
  src: "{{ item.value.src }}"
  dest: "{{ item.value.dest }}"
  owner: "{{ item.value.owner | default('root') }}"
@@ -12,7 +12,7 @@
  - percona-client-configure-copy-certificate-files
 
 - name: configure | update (user) configuration file(s)
- template:
+ ansible.builtin.template:
  src: root/.my.cnf.j2
  dest: "{{ item.dest | default('~' + item.owner + '/.my.cnf') }}"
  owner: "{{ item.owner }}"

tasks/install.yml

@@ -1,14 +1,14 @@
 # tasks file
 ---
 - name: install | dependencies
- apt:
+ ansible.builtin.apt:
  name: "{{ percona_client_dependencies }}"
  state: "{{ apt_install_state | default('latest') }}"
  tags:
  - percona-client-install-dependencies
 
 - name: install | additional
- apt:
+ ansible.builtin.apt:
  name: "{{ percona_client_install }}"
  state: "{{ apt_install_state | default('latest') }}"
  tags:

tasks/main.yml

@@ -1,24 +1,28 @@
 # tasks file
 ---
-- include: version-support.yml
+- name: version support
+ ansible.builtin.import_tasks: version-support.yml
  tags:
  - configuration
  - percona-client
  - percona-client-version-support
 
-- include: repository.yml
+- name: repository
+ ansible.builtin.import_tasks: repository.yml
  tags:
  - configuration
  - percona-client
  - percona-client-repository
 
-- include: install.yml
+- name: install
+ ansible.builtin.import_tasks: install.yml
  tags:
  - configuration
  - percona-client
  - percona-client-install
 
-- include: configure.yml
+- name: configure
+ ansible.builtin.import_tasks: configure.yml
  tags:
  - configuration
  - percona-client

tasks/repository.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: repository | install | dependencies (pre)
- apt:
+ ansible.builtin.apt:
  name: "{{ percona_client_dependencies_pre }}"
  state: "{{ apt_install_state | default('latest') }}"
  update_cache: true
@@ -11,15 +11,15 @@
  - percona-client-repository-install-dependencies
 
 - name: repository | add public key
- apt_key:
+ ansible.builtin.apt_key:
  id: 9334A25F8507EFA5
  keyserver: keyserver.ubuntu.com
  state: present
  tags:
  - percona-client-repository-public-key
 
 - name: repository | add
- apt_repository:
+ ansible.builtin.apt_repository:
  repo: "{{ item.type }} {{ item.url }} {{ item.component }}"
  state: present
  update_cache: true
@@ -28,7 +28,7 @@
  - percona-client-repository-add
 
 - name: repository | apt-pin packages
- copy:
+ ansible.builtin.copy:
  src: etc/apt/preferences.d/00percona.pref
  dest: /etc/apt/preferences.d/00percona.pref
  owner: root

tasks/version-support.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: version support | check
- fail:
+ ansible.builtin.fail:
  msg: "Percona client version {{ percona_client_version }} is not supported"
  when: percona_client_version | string not in percona_client_versions_supported
  tags:

vars/main.yml

@@ -4,18 +4,32 @@ percona_client_versions_supported:
  - '5.5'
  - '5.6'
  - '5.7'
+ - '8.0'
 
-percona_client_repositories:
+percona_client_repositories_5:
  - type: deb
  url: "http://repo.percona.com/apt {{ ansible_distribution_release }}"
  component: main
  - type: deb-src
  url: "http://repo.percona.com/apt {{ ansible_distribution_release }}"
  component: main
 
+percona_client_repositories_8:
+ - type: deb
+ url: "http://repo.percona.com/ps-80/apt {{ ansible_distribution_release }}"
+ component: main
+ - type: deb-src
+ url: "http://repo.percona.com/ps-80/apt {{ ansible_distribution_release }}"
+ component: main
+
+percona_client_repositories: "{{ percona_client_repositories_8 if percona_client_version is version('8.0', '==') else percona_client_repositories_5 }}"
+
+percona_client_version_deb_prefix: "-{{ percona_client_version }}"
+percona_client_version_deb: "{{ '' if percona_client_version is version('8.0', '==') else percona_client_version_deb_prefix }}"
+
 percona_client_dependencies_pre:
  - software-properties-common
  - dirmngr
 
 percona_client_dependencies:
- - "percona-server-client-{{ percona_client_version }}"
+ - "percona-server-client{{ percona_client_version_deb }}"