Merging upstream version 9.4.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 31 insertions, 25 deletions

diff --git a/ansible_collections/purestorage/fusion/.github/workflows/ansible-lint.yaml b/ansible_collections/purestorage/fusion/.github/workflows/ansible-lint.yaml
index 0b2102184..384c5ac93 100644
--- a/ansible_collections/purestorage/fusion/.github/workflows/ansible-lint.yaml
+++ b/ansible_collections/purestorage/fusion/.github/workflows/ansible-lint.yaml
@@ -1,5 +1,5 @@
-name: Ansible Lint # feel free to pick your own name
-on: [push, pull_request]
+name: Ansible Lint  # feel free to pick your own name
+"on": [push, pull_request]
 
 jobs:
   build:
diff --git a/ansible_collections/purestorage/fusion/.github/workflows/black.yaml b/ansible_collections/purestorage/fusion/.github/workflows/black.yaml
index 68061652a..10b16296c 100644
--- a/ansible_collections/purestorage/fusion/.github/workflows/black.yaml
+++ b/ansible_collections/purestorage/fusion/.github/workflows/black.yaml
@@ -1,6 +1,6 @@
 name: Black
 
-on: [push, pull_request]
+"on": [push, pull_request]
 
 jobs:
   lint:
diff --git a/ansible_collections/purestorage/fusion/.github/workflows/create-release.yaml b/ansible_collections/purestorage/fusion/.github/workflows/create-release.yaml
index 25725c15d..68da05e4d 100644
--- a/ansible_collections/purestorage/fusion/.github/workflows/create-release.yaml
+++ b/ansible_collections/purestorage/fusion/.github/workflows/create-release.yaml
@@ -1,6 +1,6 @@
 name: Release Collection
 
-on: workflow_dispatch
+"on": workflow_dispatch
 jobs:
   create_github_release:
     runs-on: ubuntu-latest
@@ -23,7 +23,7 @@ jobs:
           if [[ "$response" == *"$RELEASE_VERSION"* ]]; then
             trap "exit 1" EXIT
             echo "Error: Tag $RELEASE_VERSION already exists"
-            exit 1 
+            exit 1
           fi
 
       - name: Extract changelog
diff --git a/ansible_collections/purestorage/fusion/.github/workflows/main.yml b/ansible_collections/purestorage/fusion/.github/workflows/main.yml
index da0a69969..5c9a3914b 100644
--- a/ansible_collections/purestorage/fusion/.github/workflows/main.yml
+++ b/ansible_collections/purestorage/fusion/.github/workflows/main.yml
@@ -1,6 +1,6 @@
 name: Pure Storage Ansible CI
 
-on:
+"on":
   pull_request:
   push:
   schedule:
@@ -13,36 +13,23 @@ jobs:
     strategy:
       matrix:
         ansible:
-          - stable-2.11
-          - stable-2.12
-          - stable-2.13
           - stable-2.14
           - stable-2.15
+          - stable-2.16
           - devel
         python-version:
-          - 3.8
           - 3.9
           - "3.10"
           - "3.11"
         exclude:
-          - python-version: "3.11"
-            ansible: stable-2.11
-          - python-version: "3.11"
-            ansible: stable-2.12
-          - python-version: "3.11"
-            ansible: stable-2.13
-          - python-version: "3.10"
-            ansible: stable-2.11
-          - python-version: 3.8
-            ansible: stable-2.14
-          - python-version: 3.8
-            ansible: stable-2.15
-          - python-version: 3.8
+          - python-version: 3.9
+            ansible: stable-2.16
+          - python-version: 3.9
             ansible: devel
     steps:
     - name: Check out code
       uses: actions/checkout@v3
-      
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
       with:
diff --git a/ansible_collections/purestorage/fusion/.github/workflows/rh_automation_hub_token_keep_alive.yml b/ansible_collections/purestorage/fusion/.github/workflows/rh_automation_hub_token_keep_alive.yml
new file mode 100644
index 000000000..f4e0a667b
--- /dev/null
+++ b/ansible_collections/purestorage/fusion/.github/workflows/rh_automation_hub_token_keep_alive.yml
@@ -0,0 +1,19 @@
+---
+name: "Red Hat Automation Hub - Keep token alive"
+# The SSO token to upload content to Automation Hub must be accessed once every 30 days or it will be turned off
+
+"on":
+  schedule:
+    - cron: '0 12 1,15 * *'  # run 12pm on the 1st and 15th of the month
+
+jobs:
+  keep_rh_sso_token_alive:
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Run curl command"
+        run: |
+          curl ${{ secrets.RH_AUTOMATION_HUB_URL }} \
+            -d grant_type=refresh_token \
+            -d client_id="cloud-services" \
+            -d refresh_token="${{ secrets.RH_AUTOMATION_HUB_TOKEN }}" \
+            --fail --silent --show-error --output /dev/null
diff --git a/ansible_collections/purestorage/fusion/.github/workflows/stale.yml b/ansible_collections/purestorage/fusion/.github/workflows/stale.yml
index 7bbc0505b..ee7c9796e 100644
--- a/ansible_collections/purestorage/fusion/.github/workflows/stale.yml
+++ b/ansible_collections/purestorage/fusion/.github/workflows/stale.yml
@@ -1,6 +1,6 @@
 name: Mark stale issues and pull requests
 
-on:
+"on":
   schedule:
   - cron: "0 0 * * *"