Bring up to date for Ceph Reef v18.2.X

.deepsource.toml

@@ -0,0 +1,18 @@
+version = 1
+
+test_patterns = ["tests/**"]
+
+exclude_patterns = [
+    "roles/**",
+    "profiles/**",
+    "infrastructure-playbooks/**",
+    "group_vars/**",
+    "contrib/**"
+]
+
+[[analyzers]]
+name = "python"
+enabled = true
+
+  [analyzers.meta]
+  runtime_version = "3.x.x"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,7 +18,7 @@ What you expected to happen:
 How to reproduce it (minimal and precise):
 <!-- Please let us know any circumstances for reproduction of your bug. -->
 
-Share your group_vars files, inventory
+Share your group_vars files, inventory and **full** ceph-ansibe log
 
 **Environment**:
 * OS (e.g. from /etc/os-release):

.github/workflows/ansible-lint.yml

@@ -0,0 +1,19 @@
+name: ansible-lint
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+          architecture: x64
+      - run: pip install -r <(grep ansible tests/requirements.txt) ansible-lint==4.3.7 'rich>=9.5.1,<11.0.0' netaddr
+      - run: ansible-galaxy install -r requirements.yml
+      - run: ansible-lint -x 106,204,205,208 -v --force-color ./roles/*/ ./infrastructure-playbooks/*.yml site-container.yml.sample site-container.yml.sample dashboard.yml
+      - run: ansible-playbook -i ./tests/functional/all_daemons/hosts site.yml.sample --syntax-check --list-tasks -vv
+      - run: ansible-playbook -i ./tests/functional/all_daemons/hosts site-container.yml.sample --syntax-check --list-tasks -vv
+      - run: ansible-playbook -i ./tests/functional/all_daemons/hosts dashboard.yml --syntax-check --list-tasks -vv
+      - run: ansible-playbook -i ./tests/functional/all_daemons/hosts infrastructure-playbooks/*.yml --syntax-check --list-tasks -vv

.github/workflows/check-nbsp.yml

@@ -0,0 +1,8 @@
+name: check-nbsp
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: if [[ -n $(grep --exclude-dir=.git -P "\xa0" -r .) ]]; then echo 'NBSP characters found'; exit 1; fi

.github/workflows/defaults.yml

@@ -0,0 +1,10 @@
+name: defaults
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - run: "${GITHUB_WORKSPACE}/tests/scripts/workflows/defaults.sh"

.github/workflows/flake8.yml

@@ -0,0 +1,24 @@
+name: flake8
+on:
+  pull_request:
+    paths:
+      - 'library/**.py'
+      - 'module_utils/**.py'
+      - 'plugins/filter/**.py'
+      - 'tests/conftest.py'
+      - 'tests/library/**.py'
+      - 'tests/module_utils/**.py'
+      - 'tests/plugins/filter/**.py'
+      - 'tests/functional/tests/**.py'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+          architecture: x64
+      - run: pip install flake8
+      - run: flake8 --max-line-length 160 ./library/ ./module_utils/ ./plugins/filter/ ./tests/library/ ./tests/module_utils/ ./tests/plugins/filter/ ./tests/conftest.py ./tests/functional/tests/

.github/workflows/pytest.yml

@@ -0,0 +1,28 @@
+name: pytest
+on:
+  pull_request:
+    paths:
+      - 'library/**.py'
+      - 'module_utils/**.py'
+      - 'plugins/filter/**.py'
+      - 'tests/library/**.py'
+      - 'tests/module_utils/**.py'
+      - 'tests/plugins/filter/**.py'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8, 3.9]
+    name: Python ${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+      - run: pip install -r tests/requirements.txt
+      - run: pytest --cov=library/ --cov=module_utils/ --cov=plugins/filter/ -vvvv tests/library/ tests/module_utils/ tests/plugins/filter/
+        env:
+          PYTHONPATH: "$PYTHONPATH:/home/runner/work/ceph-ansible/ceph-ansible/library:/home/runner/work/ceph-ansible/ceph-ansible/module_utils:/home/runner/work/ceph-ansible/ceph-ansible/plugins/filter:/home/runner/work/ceph-ansible/ceph-ansible"

.github/workflows/signed-off.yml

@@ -0,0 +1,10 @@
+name: signed-off
+on: [pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - run: "${GITHUB_WORKSPACE}/tests/scripts/workflows/signed-off.sh"

.github/workflows/stale.yml

@@ -0,0 +1,35 @@
+
+name: "Mark or close stale issues and PRs"
+on:
+  schedule:
+  # Run the stalebot every day at 8pm UTC
+  - cron: "00 20 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 15
+        days-before-close: 7
+        days-before-pr-close: 14
+        stale-issue-message: >
+          This issue has been automatically marked as stale because it has not had recent activity.
+          It will be closed in a week if no further activity occurs.
+          Thank you for your contributions.
+        stale-pr-message: >
+          This pull request has been automatically marked as stale because it has not had
+          recent activity. It will be closed in two weeks if no further activity occurs.
+          Thank you for your contributions.
+        close-issue-message: >
+          This issue has been automatically closed due to inactivity.
+          Please re-open if this still requires investigation.
+        close-pr-message: >
+          This pull request has been automatically closed due to inactivity.
+          Please re-open if these changes are still required.
+        stale-pr-label: "stale"
+        stale-issue-label: "wontfix"
+        exempt-issue-labels: "do-not-close"
+        exempt-pr-labels: "do-not-close"

.gitignore

@@ -20,3 +20,4 @@ ceph-ansible.spec
 !.travis.yml
 !.mergify.yml
 !raw_install_python.yml
+!requirements.yml

.mergify.yml

@@ -1,42 +1,56 @@
 pull_request_rules:
-  - name: automatic merge on skip ci
-    conditions:
-      - label!=DNM
-      - title~=\[skip ci\]
-      - '#approved-reviews-by>=2'
-    actions:
-      merge:
-        method: rebase
-        rebase_fallback: merge
-        strict: smart
-      dismiss_reviews: {}
-      delete_head_branch: {}
 # Backports
   - actions:
       backport:
         branches:
-        - stable-3.0
+          - stable-3.0
     conditions:
       - label=backport-stable-3.0
     name: backport stable-3.0
   - actions:
       backport:
         branches:
-        - stable-3.1
+          - stable-3.1
     conditions:
       - label=backport-stable-3.1
     name: backport stable-3.1
   - actions:
       backport:
         branches:
-        - stable-3.2
+          - stable-3.2
     conditions:
       - label=backport-stable-3.2
     name: backport stable-3.2
   - actions:
       backport:
         branches:
-        - stable-4.0
+          - stable-4.0
     conditions:
       - label=backport-stable-4.0
     name: backport stable-4.0
+  - actions:
+      backport:
+        branches:
+          - stable-5.0
+    conditions:
+      - label=backport-stable-5.0
+    name: backport stable-5.0
+  - actions:
+      backport:
+        branches:
+          - stable-6.0
+    conditions:
+      - label=backport-stable-6.0
+    name: backport stable-6.0
+  - actions:
+      backport:
+        branches:
+          - stable-7.0
+    conditions:
+      - label=backport-stable-7.0
+    name: backport stable-7.0
+commands_restrictions:
+  backport:
+    conditions:
+      - base=main
+      - number<0

.readthedocs.yaml

@@ -0,0 +1,6 @@
+version: 2
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.9"

CONTRIBUTING.md

@@ -41,11 +41,11 @@ This will prevent the engine merging your pull request.
 
 ### Backports (maintainers only)
 
-If you wish to see your work from 'master' being backported to a stable branch you can ping a maintainer
-so he will set the backport label on your PR. Once the PR from master is merged, a backport PR will be created by mergify,
+If you wish to see your work from 'main' being backported to a stable branch you can ping a maintainer
+so he will set the backport label on your PR. Once the PR from main is merged, a backport PR will be created by mergify,
 if there is a cherry-pick conflict you must resolv it by pulling the branch.
 
-**NEVER** push directly into a stable branch, **unless** the code from master has diverged so much that the files don't exist in the stable branch.
+**NEVER** push directly into a stable branch, **unless** the code from main has diverged so much that the files don't exist in the stable branch.
 If that happens, inform the maintainers of the reasons why you pushed directly into a stable branch, if the reason is invalid, maintainers will immediatly close your pull request.
 
 ## Good to know
@@ -77,8 +77,8 @@ You must run `./generate_group_vars_sample.sh` before you commit your changes so
 
 ### Keep your branch up-to-date
 
-Sometimes, a pull request can be subject to long discussion, reviews and comments, meantime, `master`
-moves forward so let's try to keep your branch rebased on master regularly to avoid huge conflict merge.
+Sometimes, a pull request can be subject to long discussion, reviews and comments, meantime, `main`
+moves forward so let's try to keep your branch rebased on main regularly to avoid huge conflict merge.
 A rebased branch is more likely to be merged easily & shorter.
 
 ### Organize your commits
@@ -100,4 +100,4 @@ If you've got commits fixing typos or other problems introduced by previous comm
 If you are new to Git, these links might help:
 
 - [https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History)
-- [http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)
+- [http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)

Makefile

@@ -19,7 +19,7 @@ NAME = ceph-ansible
 #  "ceph-ansible-2.2.0-1.el8"
 
 DIST ?= "el8"
-MOCK_CONFIG ?= "epel-8-x86_64"
+MOCK_CONFIG ?= "centos-stream+epel-8-x86_64"
 TAG := $(shell git describe --tags --abbrev=0 --match 'v*')
 VERSION := $(shell echo $(TAG) | sed 's/^v//')
 COMMIT := $(shell git rev-parse HEAD)
@@ -101,7 +101,7 @@ tag:
 	    echo "$(SHORTCOMMIT) on $(BRANCH) is already tagged as $(TAG)"; \
 	    exit 1; \
 	fi
-	if [[ "$(BRANCH)" != "master" ]] && \
+	if [[ "$(BRANCH)" != "master" || "$(BRANCH)" != "main" ]] && \
 	   ! [[ "$(BRANCH)" =~ ^stable- ]]; then \
 		echo Cannot tag $(BRANCH); \
 		exit 1; \