Merging upstream version 10.1.0+dfsg.

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

7 files changed, 115 insertions, 100 deletions

diff --git a/ansible_collections/inspur/ispim/CHANGELOG.rst b/ansible_collections/inspur/ispim/CHANGELOG.rst
index 4a5628834..fa1910bf0 100644
--- a/ansible_collections/inspur/ispim/CHANGELOG.rst
+++ b/ansible_collections/inspur/ispim/CHANGELOG.rst
@@ -5,6 +5,14 @@ Inspur.Ispim Release Notes
 .. contents:: Topics
 
 
+v2.2.3
+======
+
+Bugfixes
+--------
+
+- Change the ansible version in meta/runtime.yml to 2.15.0(https://github.com/ispim/inspur.ispim/pull/37).
+
 v2.2.2
 ======
 
diff --git a/ansible_collections/inspur/ispim/FILES.json b/ansible_collections/inspur/ispim/FILES.json
index 2bc19535d..af8ca85a3 100644
--- a/ansible_collections/inspur/ispim/FILES.json
+++ b/ansible_collections/inspur/ispim/FILES.json
@@ -970,7 +970,7 @@
    "name": "meta/runtime.yml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "d365367ae9434742bca426eee9c07bb98c2879e1a12455869d2e17bbf4448304",
+   "chksum_sha256": "dba5c07af6167cb78bb80c586611346196d3ba9bf728dbb1373a0dd32ce9c7c0",
    "format": 1
   },
   {
@@ -1915,14 +1915,14 @@
    "name": "changelogs/changelog.yaml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "bb70a110be0417beb579fcf78f9ec1dc600d0f24bb934bcde8b7224afefa0358",
+   "chksum_sha256": "25ca9690429dabc556de31df0e4415b1ee2c455103d716e83043bcf0f20a9e91",
    "format": 1
   },
   {
    "name": "changelogs/.plugin-cache.yaml",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "be9b2ed7bd93a18b6fb794fb56a5c7a838b50be73f6e1576120edfc93a0d6512",
+   "chksum_sha256": "b4028bf04a70c382bd09bd1fb91e4a5d61aaac0e30a84b6846fff2f0f3a694d3",
    "format": 1
   },
   {
@@ -1971,7 +1971,7 @@
    "name": "README.md",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "4d3e8acd6e4e1f4a717de66ae790c01bf7c799bfe7d7f8b4644dead575744ad4",
+   "chksum_sha256": "4d6595ae87f7916ecdd5fe9fbc6a36ea9c98980537d609f73742ab376f14c370",
    "format": 1
   },
   {
@@ -1992,7 +1992,7 @@
    "name": "CHANGELOG.rst",
    "ftype": "file",
    "chksum_type": "sha256",
-   "chksum_sha256": "d097f759cd6be86c5764be9dedaf6a045cee9a616717d64cc2c6bda342ac859f",
+   "chksum_sha256": "0fb2f13dea29f7c0a337c5c8a31c7ac70ee03a9419e8e29153c8bc2e2b4d5385",
    "format": 1
   }
  ],
diff --git a/ansible_collections/inspur/ispim/MANIFEST.json b/ansible_collections/inspur/ispim/MANIFEST.json
index ba2b9362f..1cf4c2191 100644
--- a/ansible_collections/inspur/ispim/MANIFEST.json
+++ b/ansible_collections/inspur/ispim/MANIFEST.json
@@ -2,7 +2,7 @@
  "collection_info": {
   "namespace": "inspur",
   "name": "ispim",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "authors": [
    "Baoshan Wang <wangbaoshan@inspur.com>"
   ],
@@ -29,7 +29,7 @@
   "name": "FILES.json",
   "ftype": "file",
   "chksum_type": "sha256",
-  "chksum_sha256": "8512bf3f7cc02f00ab9edd6f6fd4e313c414b697cf1fa2b8d6465c46b48131a0",
+  "chksum_sha256": "55f7d6745a2974d75b938207b0a447b3ac5ef2d7c50edb9764aa89b8b2df5533",
   "format": 1
  },
  "format": 1
diff --git a/ansible_collections/inspur/ispim/README.md b/ansible_collections/inspur/ispim/README.md
index a596693de..27b4e89c6 100644
--- a/ansible_collections/inspur/ispim/README.md
+++ b/ansible_collections/inspur/ispim/README.md
@@ -1,90 +1,90 @@
-# inspur sm Collection
-
-This repo contains the `inspur.ispim` Ansible Collection. Inspur server supports ansible management device,Basic management of the server based on restful interface.
-
-## Tested with Ansible
-
-Tested with the current Ansible 2.15 releases and the current development version of Ansible. Ansible versions before 2.10.0 are not supported.
-
-## External requirements
-
-Circumstance instruction:
-Ansible module is suitable for ansible version 2.15
-
-Main steps:
-
-* Install Ansible 2.15
-* Install inspursmsdk: pip install inspursmsdk
-<!--- A step-by-step reproduction of the problem is helpful if there is no related issue -->
-Thes modules require the following to be installed on the control node:
-
-* Python 3.7 or later
-* [Ansible](http://www.ansible.com) 2.10 or later
-* [Inspur support] [inspursmsdk](https://github.com/ISIB-Group/inspursmsdk) 1.5.0 or later
-
-## Included content
-
-Please check the included content on the [Ansible Galaxy page for this collection](https://galaxy.ansible.com/inspur/ispim)
-
-## Using this collection
-
-Before using the General community collection, you need to install the collection with the `ansible-galaxy` CLI:
-
-    ansible-galaxy collection install inspur.ispim
-
-You can also include it in a `requirements.yml` file and install it via `ansible-galaxy collection install -r requirements.yml` using the format:
-
-```yaml
-collections:
-- name: inspur.ispim
-```
-
-See [Ansible Using collections](https://isib-group.github.io/inspur.ispim-docs/index.html) for more details.
-
-## Contributing to this collection
-
-If you want to develop new content for this collection or improve what is already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATH`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.
-
-You can find more information in the [developer guide for collections](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#contributing-to-collections), and in the [Ansible inspur.ispim Guide](https://ispim.github.io/inspur.ispim-docs/index.html).
-
-### Running tests
-
-See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#testing-collections).
-
-### Communication
-
-wangbaoshan@inspur.com
-
-
-### Publishing New Version
-
-Basic instructions without release branches:
-
-1. Create `changelogs/fragments/<version>.yml` with `release_summary:` section (which must be a string, not a list).
-2. Run `antsibull-changelog release --collection-flatmap yes`
-3. Make sure `CHANGELOG.rst` and `changelogs/changelog.yaml` are added to git, and the deleted fragments have been removed.
-4. Tag the commit with `<version>`. Push changes and tag to the main repository.
-
-## Release notes
-
-See the [changelog](https://github.com/ispim/inspur.ispim/blob/main/CHANGELOG.rst).
-
-## Roadmap
-
-See [this issue](https://github.com/ispim/inspur.ispim/issues/2) for information on releasing, versioning and deprecation.
-
-In general, we plan to release a major version every year, and minor versions every three months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.
-
-
-## More information
-
-- [Ansible Collection overview](https://github.com/ansible-collections/overview)
-- [Ansible User guide](https://docs.ansible.com/ansible/latest/user_guide/index.html)
-- [Ansible Developer guide](https://docs.ansible.com/ansible/latest/dev_guide/index.html)
-- [Ansible Community code of conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html)
-
-## Licensing
-
-GNU General Public License v3.0 or later.
-
-See [COPYING](https://www.gnu.org/licenses/gpl-3.0.txt) to see the full text.
+# inspur sm Collection

+

+This repo contains the `inspur.ispim` Ansible Collection. Inspur server supports ansible management device,Basic management of the server based on restful interface.

+

+## Tested with Ansible

+

+Tested with the current Ansible 2.15.0 releases and the current development version of Ansible. Ansible versions before 2.10.0 are not supported.

+

+## External requirements

+

+Circumstance instruction:

+Ansible module is suitable for ansible version 2.15.0

+

+Main steps:

+

+* Install Ansible 2.15.0

+* Install inspursmsdk: pip install inspursmsdk

+<!--- A step-by-step reproduction of the problem is helpful if there is no related issue -->

+Thes modules require the following to be installed on the control node:

+

+* Python 3.7 or later

+* [Ansible](http://www.ansible.com) 2.15.0 or later

+* [Inspur support] [inspursmsdk](https://github.com/ISIB-Group/inspursmsdk) 1.5.0 or later

+

+## Included content

+

+Please check the included content on the [Ansible Galaxy page for this collection](https://galaxy.ansible.com/inspur/ispim)

+

+## Using this collection

+

+Before using the General community collection, you need to install the collection with the `ansible-galaxy` CLI:

+

+    ansible-galaxy collection install inspur.ispim

+

+You can also include it in a `requirements.yml` file and install it via `ansible-galaxy collection install -r requirements.yml` using the format:

+

+```yaml

+collections:

+- name: inspur.ispim

+```

+

+See [Ansible Using collections](https://isib-group.github.io/inspur.ispim-docs/index.html) for more details.

+

+## Contributing to this collection

+

+If you want to develop new content for this collection or improve what is already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATH`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.

+

+You can find more information in the [developer guide for collections](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#contributing-to-collections), and in the [Ansible inspur.ispim Guide](https://ispim.github.io/inspur.ispim-docs/index.html).

+

+### Running tests

+

+See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#testing-collections).

+

+### Communication

+

+wangbaoshan@inspur.com

+

+

+### Publishing New Version

+

+Basic instructions without release branches:

+

+1. Create `changelogs/fragments/<version>.yml` with `release_summary:` section (which must be a string, not a list).

+2. Run `antsibull-changelog release --collection-flatmap yes`

+3. Make sure `CHANGELOG.rst` and `changelogs/changelog.yaml` are added to git, and the deleted fragments have been removed.

+4. Tag the commit with `<version>`. Push changes and tag to the main repository.

+

+## Release notes

+

+See the [changelog](https://github.com/ispim/inspur.ispim/blob/main/CHANGELOG.rst).

+

+## Roadmap

+

+See [this issue](https://github.com/ispim/inspur.ispim/issues/2) for information on releasing, versioning and deprecation.

+

+In general, we plan to release a major version every year, and minor versions every three months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.

+

+

+## More information

+

+- [Ansible Collection overview](https://github.com/ansible-collections/overview)

+- [Ansible User guide](https://docs.ansible.com/ansible/latest/user_guide/index.html)

+- [Ansible Developer guide](https://docs.ansible.com/ansible/latest/dev_guide/index.html)

+- [Ansible Community code of conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html)

+

+## Licensing

+

+GNU General Public License v3.0 or later.

+

+See [COPYING](https://www.gnu.org/licenses/gpl-3.0.txt) to see the full text.

diff --git a/ansible_collections/inspur/ispim/changelogs/.plugin-cache.yaml b/ansible_collections/inspur/ispim/changelogs/.plugin-cache.yaml
index 8280c23b8..1a883f7e7 100644
--- a/ansible_collections/inspur/ispim/changelogs/.plugin-cache.yaml
+++ b/ansible_collections/inspur/ispim/changelogs/.plugin-cache.yaml
@@ -652,4 +652,4 @@ plugins:
   shell: {}
   strategy: {}
   vars: {}
-version: 2.2.2
+version: 2.2.3
diff --git a/ansible_collections/inspur/ispim/changelogs/changelog.yaml b/ansible_collections/inspur/ispim/changelogs/changelog.yaml
index 3134f2326..d99e44707 100644
--- a/ansible_collections/inspur/ispim/changelogs/changelog.yaml
+++ b/ansible_collections/inspur/ispim/changelogs/changelog.yaml
@@ -499,3 +499,10 @@ releases:
     fragments:
     - 35-delete_venv.yml
     release_date: '2024-06-06'
+  2.2.3:
+    changes:
+      bugfixes:
+      - Change the ansible version in meta/runtime.yml to 2.15.0(https://github.com/ispim/inspur.ispim/pull/37).
+    fragments:
+    - 37-edit_ansible_version.yml
+    release_date: '2024-06-14'
diff --git a/ansible_collections/inspur/ispim/meta/runtime.yml b/ansible_collections/inspur/ispim/meta/runtime.yml
index 1c7d1bb7c..5f8d47e7b 100644
--- a/ansible_collections/inspur/ispim/meta/runtime.yml
+++ b/ansible_collections/inspur/ispim/meta/runtime.yml
@@ -1,2 +1,2 @@
----
-requires_ansible: '>=2.15'
+---

+requires_ansible: '>=2.15.0'