Merge branch 'release/4.3.0'

.travis.yml

@@ -17,7 +17,6 @@ env:
 
 jobs:
   allow_failures:
-    - env: MOLECULE_SCENARIO_NAME="ubuntu-20.04"
     - env: MOLECULE_SCENARIO_NAME="ubuntu-19.10"
     - env: MOLECULE_SCENARIO_NAME="centos-8"
     - env: MOLECULE_SCENARIO_NAME="centos-7"

CHANGELOG.md

@@ -12,6 +12,8 @@
   - Migrate role name to lowercase or underline
   - Migrate group name to lowercase or underline
   - Migrate molecule `group_vars` to file
+  - Add MariaDB 10.5 support
+  - Remove MariaDB 10.2 support
 
 ## 4.2.0 - 2020-02-13
 

defaults/main.yml

@@ -15,4 +15,4 @@
 # limitations under the License.
 
 # MariaDB release.
-mariadb_release: "10.4"
+mariadb_release: "10.5"

handlers/main.yml

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: mariadb | systemctl restart
+- name: mariadb | systemctl restart mariadb
   service:
     name: "mariadb"
     state: "restarted"

molecule/default/Dockerfile.j2

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG   "en_US.utf8"
 ENV LC_ALL "en_US.utf8"

molecule/default/molecule.yml

@@ -24,7 +24,7 @@ platforms:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     entrypoint: init
     command: "bash -c 'sleep infinity'"
-    tty: True
+    tty: true
     env:
       container: docker
 lint: |

molecule/ubuntu-20.04/molecule.yml

@@ -15,18 +15,23 @@
 # limitations under the License.
 
 driver:
-  name: docker
+  name: vagrant
+  provider:
+    name: libvirt
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
-    dockerfile: Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    entrypoint: init
-    command: "bash -c 'sleep infinity'"
-    tty: True
-    env:
-      container: docker
+    box: abi/ubuntu2004
+    cpu: 2
+    memory: 2048
+    interfaces:
+      - auto_config: true
+        network_name: private_network
+        type: dhcp
+    provider_raw_config_args:
+      - 'nic_model_type = "virtio"'
+      - 'disk_bus = "virtio"'
+      - 'volume_cache = "none"'
+      - 'storage :file, bus: "virtio", cache: "none"'
 lint: |
   set -ex
   yamllint .

tasks/debian.yml

@@ -58,5 +58,5 @@
   register: result
   until: result is succeeded
   notify:
-    - mariadb | systemctl restart
+    - mariadb | systemctl restart mariadb
   tags: mariadb

tasks/main.yml

@@ -48,15 +48,15 @@
   ignore_errors: true
   tags: mariadb
 
-- name: flush handlers
-  meta: flush_handlers
-  tags: mariadb
-
-- name: start service
+- name: systemctl start mariadb
   service:
     name: "mariadb"
     state: "started"
     enabled: true
   changed_when: false
   ignore_errors: true
   tags: mariadb
+
+- name: flush handlers
+  meta: flush_handlers
+  tags: mariadb

tasks/redhat.yml

@@ -48,11 +48,11 @@
 - name: yum install
   yum:
     name: "{{ item.name }}"
+    state: "{{ item.state }}"
     disablerepo: "{{ item.disablerepo | default(None) or omit }}"
-    state: "{{ item.state | default(None) or omit }}"
   loop: "{{ _yum[mariadb_release] }}"
   register: result
   until: result is succeeded
   notify:
-    - mariadb | systemctl restart
+    - mariadb | systemctl restart mariadb
   tags: mariadb

tasks/suse.yml

@@ -48,6 +48,8 @@
     auto_import_keys: true
     autorefresh: true
   loop: "{{ _zypper_repository[mariadb_release] }}"
+  register: result
+  until: result is succeeded
   tags: mariadb
 
 - name: zypper install
@@ -61,5 +63,5 @@
   register: result
   until: result is succeeded
   notify:
-    - mariadb | systemctl restart
+    - mariadb | systemctl restart mariadb
   tags: mariadb

vars/centos-7.yml

@@ -15,58 +15,58 @@
 # limitations under the License.
 
 _rpm_key:
-  "10.4":
+  "10.5":
     - key: "https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
       fingerprint: "199369E5404BD5FC7D2FE43BCBCB082A1BB943DB"
       state: "present"
-  "10.3":
+  "10.4":
     - key: "https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
       fingerprint: "199369E5404BD5FC7D2FE43BCBCB082A1BB943DB"
       state: "present"
-  "10.2":
+  "10.3":
     - key: "https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
       fingerprint: "199369E5404BD5FC7D2FE43BCBCB082A1BB943DB"
       state: "present"
 
 _yum_repository:
-  "10.4":
+  "10.5":
     - file: "mariadb"
       name: "mariadb"
       description: "MariaDB"
-      baseurl: "http://yum.mariadb.org/10.4/centos7-amd64"
+      baseurl: "http://yum.mariadb.org/10.5/centos7-amd64"
       enabled: true
       gpgcheck: true
       gpgkey: "https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
       state: "present"
-  "10.3":
+  "10.4":
     - file: "mariadb"
       name: "mariadb"
       description: "MariaDB"
-      baseurl: "http://yum.mariadb.org/10.3/centos7-amd64"
+      baseurl: "http://yum.mariadb.org/10.4/centos7-amd64"
       enabled: true
       gpgcheck: true
       gpgkey: "https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
       state: "present"
-  "10.2":
+  "10.3":
     - file: "mariadb"
       name: "mariadb"
       description: "MariaDB"
-      baseurl: "http://yum.mariadb.org/10.2/centos7-amd64"
+      baseurl: "http://yum.mariadb.org/10.3/centos7-amd64"
       enabled: true
       gpgcheck: true
       gpgkey: "https://yum.mariadb.org/RPM-GPG-KEY-MariaDB"
       state: "present"
 
 _yum:
-  "10.4":
+  "10.5":
     - { state: "latest", name: "boost-devel" }
     - { state: "latest", name: "MariaDB-server" }
     - { state: "latest", name: "MariaDB-backup" }
-  "10.3":
+  "10.4":
     - { state: "latest", name: "boost-devel" }
     - { state: "latest", name: "MariaDB-server" }
     - { state: "latest", name: "MariaDB-backup" }
-  "10.2":
+  "10.3":
     - { state: "latest", name: "boost-devel" }
     - { state: "latest", name: "MariaDB-server" }
     - { state: "latest", name: "MariaDB-backup" }