Merge branch 'release/1.16.14' into main

.gitchangelog.rc

@@ -151,9 +151,31 @@ output_engine = mustache("markdown")
 include_merge = False
 log_encoding = 'utf-8'
 OUTPUT_FILE = "CHANGELOG.md"
-INSERT_POINT_REGEX = r'(\#\#\s*)'
-revs = ['^1.6.10', 'HEAD']
+INSERT_POINT_REGEX = r'''(?isxu)
+^
+(
+  \s*\#\s+Changelog\s*(\n|\r\n|\r)        ## ``Changelog`` line
+)
+
+(                     ## Match all between changelog and release rev
+    (
+      (?!
+         (?<=(\n|\r))                ## look back for newline
+         \#\#\s+%(rev)s                     ## revision
+         \s+
+         \([0-9]+-[0-9]{2}-[0-9]{2}\)(\n|\r\n|\r)   ## date
+      )
+      .
+    )*
+)
 
+(?P<tail>\#\#\s+(?P<rev>%(rev)s))
+''' % {'rev': r"[0-9]+\.[0-9]+(\.[0-9]+)?"}
+
+revs = [
+    Caret(FileFirstRegexMatch(OUTPUT_FILE, INSERT_POINT_REGEX)),
+    'HEAD'
+]
 publish = FileInsertAtFirstRegexMatch(
     OUTPUT_FILE, INSERT_POINT_REGEX,
     idx=lambda m: m.start(1)

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## 1.6.14
+
+### Changes
+
+* Update metadata now that we have tested against Fedora 35. [Ben Dalling]
+
+* Update the Python packages. [Ben Dalling]
+
+### Fix
+
+* Fully qualify the collection name for builtin actions. [Ben Dalling]
+
+### Other
+
+* Build(deps): bump paramiko from 2.8.0 to 2.10.1. [dependabot[bot]]
+
+  Bumps [paramiko](https://github.com/paramiko/paramiko) from 2.8.0 to 2.10.1.
+  - [Release notes](https://github.com/paramiko/paramiko/releases)
+  - [Changelog](https://github.com/paramiko/paramiko/blob/main/NEWS)
+  - [Commits](https://github.com/paramiko/paramiko/compare/2.8.0...2.10.1)
+
+  ---
+  updated-dependencies:
+  - dependency-name: paramiko
+    dependency-type: direct:production
+  ...
+
+
 ## 1.6.13
 
 ### New

handlers/main.yml

@@ -1,7 +1,7 @@
 # handlers file for cassandra
 ---
 - name: cassandra_restart_service
-  service:
+  ansible.builtin.service:
     name: cassandra
     state: restarted
     enabled: "{{ cassandra_service_enabled }}"

meta/main.yml

@@ -52,5 +52,6 @@ galaxy_info:
         - 32  # https://github.com/ansible/galaxy/issues/2356
         - 33  # https://github.com/ansible/galaxy/issues/2533
         - 34
+        - 35
 
   dependencies: []

molecule/combine_cluster/converge.yml

@@ -69,19 +69,19 @@
 
   post_tasks:
     - name: Wait for the Cassandra Listener
-      wait_for:
+      ansible.builtin.wait_for:
         host: "{{ ansible_default_ipv4.address }}"
         port: 9042
       when: not ansible_check_mode
 
     - name: Wait for the Cassandra to Gossip
-      wait_for:
+      ansible.builtin.wait_for:
         host: "{{ ansible_default_ipv4.address }}"
         port: 9160
       when: not ansible_check_mode
 
     - name: Wait for the Cassandra Service to be Running (Red Hat)
-      service_facts:
+      ansible.builtin.service_facts:
       retries: 100
       delay: 3
       register: cassandra_services_facts
@@ -95,7 +95,7 @@
         - ansible_distribution != "Fedora"
 
     - name: Wait for the Cassandra Service to be Running (Debian)
-      service_facts:
+      ansible.builtin.service_facts:
       retries: 100
       delay: 3
       register: cassandra_services_facts

molecule/default/converge.yml

@@ -64,14 +64,14 @@
 
   pre_tasks:
     - name: Set Variables for Clustered Nodes
-      set_fact:
+      ansible.builtin.set_fact:
         cassandra_cluster_name: MyCassandraCluster
         cassandra_join_cluster: True
         cassandra_seed: "{{ hostvars[groups['cassandra'][0]]['ansible_default_ipv4'].address }}"
       when: "'clustered' in group_names"
 
     - name: Set Variables for Standalone Nodes
-      set_fact:
+      ansible.builtin.set_fact:
         cassandra_cluster_name: Standalone
         cassandra_seed: "{{ ansible_default_ipv4.address }}"
       when: "'standalone' is in group_names"
@@ -81,19 +81,19 @@
 
   post_tasks:
     - name: Wait for the Cassandra Listener
-      wait_for:
+      ansible.builtin.wait_for:
         host: "{{ ansible_default_ipv4.address }}"
         port: 9042
       when: not ansible_check_mode
 
     - name: Wait for the Cassandra to Gossip
-      wait_for:
+      ansible.builtin.wait_for:
         host: "{{ ansible_default_ipv4.address }}"
         port: 9160
       when: not ansible_check_mode
 
     - name: Wait for the Cassandra Service to be Running (Red Hat)
-      service_facts:
+      ansible.builtin.service_facts:
       retries: 100
       delay: 3
       register: cassandra_services_facts
@@ -107,7 +107,7 @@
         - ansible_distribution != "Fedora"
 
     - name: Wait for the Cassandra Service to be Running (Debian)
-      service_facts:
+      ansible.builtin.service_facts:
       retries: 100
       delay: 3
       register: cassandra_services_facts

molecule/default/prepare.yml

@@ -14,9 +14,9 @@
 
   tasks:
     - name: Display Host Information
-      debug:
+      ansible.builtin.debug:
         var: instance_info
 
     - name: Display Ansible Facts
-      debug:
+      ansible.builtin.debug:
         var: ansible_facts

molecule/latest/converge.yml

@@ -61,14 +61,14 @@
 
   pre_tasks:
     - name: Set Variables for Clustered Nodes
-      set_fact:
+      ansible.builtin.set_fact:
         cassandra_cluster_name: MyCassandraCluster
         cassandra_join_cluster: False
         cassandra_seed: "{{ hostvars[groups['cassandra'][0]]['ansible_default_ipv4'].address }}"
       when: "'clustered' in group_names"
 
     - name: Set Variables for Standalone Nodes
-      set_fact:
+      ansible.builtin.set_fact:
         cassandra_cluster_name: Standalone
         cassandra_seed: "{{ ansible_default_ipv4.address }}"
       when: "'standalone' is in group_names"
@@ -78,19 +78,19 @@
 
   post_tasks:
     - name: Wait for the Cassandra Listener
-      wait_for:
+      ansible.builtin.wait_for:
         host: "{{ ansible_default_ipv4.address }}"
         port: 9042
       when: not ansible_check_mode
 
     - name: Wait for the Cassandra to Gossip
-      wait_for:
+      ansible.builtin.wait_for:
         host: "{{ ansible_default_ipv4.address }}"
         port: 9160
       when: not ansible_check_mode
 
     - name: Wait for the Cassandra Service to be Running (Red Hat)
-      service_facts:
+      ansible.builtin.service_facts:
       retries: 100
       delay: 3
       register: cassandra_services_facts
@@ -104,7 +104,7 @@
         - ansible_distribution != "Fedora"
 
     - name: Wait for the Cassandra Service to be Running (Debian)
-      service_facts:
+      ansible.builtin.service_facts:
       retries: 100
       delay: 3
       register: cassandra_services_facts

molecule/latest/prepare.yml

@@ -14,5 +14,5 @@
 
   tasks:
     - name: Display Host Information
-      debug:
+      ansible.builtin.debug:
         var: instance_info

requirements.txt

@@ -1,65 +1,64 @@
-ansible==4.8.0
-ansible-compat==0.5.0
-ansible-core==2.11.6
-ansible-lint==5.2.1
-arrow==1.2.1
-attrs==21.2.0
+ansible==5.5.0
+ansible-compat==2.0.2
+ansible-core==2.12.4
+ansible-lint==6.0.2
+arrow==1.2.2
+attrs==21.4.0
 bcrypt==3.2.0
 binaryornot==0.4.4
 bracex==2.2.1
 Cerberus==1.3.2
 certifi==2021.10.8
 cffi==1.15.0
 chardet==4.0.0
-charset-normalizer==2.0.7
-click==8.0.3
+charset-normalizer==2.0.12
+click==8.1.2
 click-help-colors==0.9.1
-colorama==0.4.4
 commonmark==0.9.1
 cookiecutter==1.7.3
-cryptography==35.0.0
+cryptography==36.0.2
 docker==5.0.3
-enrich==1.2.6
+enrich==1.2.7
 flake8==4.0.1
 gitchangelog==3.0.4
 idna==3.3
 iniconfig==1.1.1
-Jinja2==3.0.3
+Jinja2==3.1.1
 jinja2-time==0.2.0
-MarkupSafe==2.0.1
+MarkupSafe==2.1.1
 mccabe==0.6.1
-molecule==3.5.2
+molecule==3.6.1
 molecule-docker==1.1.0
-packaging==21.2
+packaging==21.3
 parameterized==0.8.1
-paramiko==2.8.0
+paramiko==2.10.3
 pathspec==0.9.0
 pluggy==1.0.0
 poyo==0.5.0
 py==1.11.0
 pycodestyle==2.8.0
 pycparser==2.21
 pyflakes==2.4.0
-Pygments==2.10.0
-PyNaCl==1.4.0
-pyparsing==2.4.7
-pystache==0.5.4
-pytest==6.2.5
-pytest-testinfra==6.4.0
+Pygments==2.11.2
+PyNaCl==1.5.0
+pyparsing==3.0.7
+pystache==0.6.0
+pytest==7.1.1
+pytest-testinfra==6.6.0
 python-dateutil==2.8.2
-python-slugify==5.0.2
-PyYAML==5.4.1
-requests==2.26.0
+python-slugify==6.1.1
+PyYAML==6.0
+requests==2.27.1
 resolvelib==0.5.4
-rich==10.13.0
-ruamel.yaml==0.17.17
+rich==12.1.0
+ruamel.yaml==0.17.21
 ruamel.yaml.clib==0.2.6
 six==1.16.0
 subprocess-tee==0.3.5
-tenacity==8.0.1
 text-unidecode==1.3
-toml==0.10.2
-urllib3==1.26.7
+tomli==2.0.1
+typing_extensions==4.1.1
+urllib3==1.26.9
 wcmatch==8.3
-websocket-client==1.2.1
+websocket-client==1.3.2
 yamllint==1.26.3

tasks/assertions.yml

@@ -1,13 +1,13 @@
 ---
 
 - name: Check OS is supported
-  assert:
+  ansible.builtin.assert:
     that:
       - ansible_os_family | default('') is in ['Debian', "RedHat"]
     fail_msg: "unsupported OS ({{ ansible_os_family | d(None) }}) or facts not gathered"
 
 - name: Check use of deprecated variables
-  debug:
+  ansible.builtin.debug:
     msg: "{{ variable.name }} is deprecated; use {{ variable.replacement }} instead"
   when: lookup('vars', variable.name, default='') | length
   loop: "{{ deprecated_variables }}"

tasks/configure.yml

@@ -1,7 +1,7 @@
 ---
 
 - name: Create Custom Directory
-  file:
+  ansible.builtin.file:
     group: "{{ directory.0.spec.group | default('cassandra') }}"
     mode: "{{ directory.0.spec.mode | default('0700') }}"
     owner: "{{ directory.0.spec.owner | default('cassandra') }}"
@@ -17,7 +17,7 @@
     - cassandra_directories is defined
 
 - name: Apply Cassandra Configuration
-  template:
+  ansible.builtin.template:
     src: "{{ cassandra_configuration_templ }}"
     dest: "{{ cassandra_configuration_file }}"
     owner: root
@@ -27,7 +27,7 @@
     - cassandra_restart_service
 
 - name: Apply Regular Expression Updates to the Configuration
-  lineinfile:
+  ansible.builtin.lineinfile:
     line: "{{ item.line }}"
     path: "{{ cassandra_configuration_directory }}/{{ item.path }}"
     regexp: "{{ item.regexp }}"
@@ -38,7 +38,7 @@
     - cassandra_restart_service
 
 - name: Set the DC for Cassandra
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ cassandra_configuration_file | dirname }}/cassandra-rackdc.properties"
     regexp: '^dc='
     line: "dc={{ cassandra_dc }}"
@@ -49,7 +49,7 @@
     - cassandra_restart_service
 
 - name: Set the Rack for Cassandra
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ cassandra_configuration_file | dirname }}/cassandra-rackdc.properties"
     regexp: '^rack='
     line: "rack={{ cassandra_rack }}"