Merge pull request #38 from serverscom/fix-bm-ci

RAID0 from one disk is no more supported by servers.com PAPI

Author: silentirk

ansible_collections/serverscom/sc_api/galaxy.yml

@@ -1,11 +1,12 @@
 ---
 namespace: serverscom
 name: sc_api
-version: 0.4.0
+version: 0.5.0
 readme: README.md
 authors:
   - George Shuklin <george.shuklin@gmail.com>
   - Volodymyr Rudniev <rudnev.vv@gmail.com>
+  - Aleksandr Chudinov <silentirk@me.com>
 description: Collection of modules to work with Servers.com API
 license:
   - GPL-3.0-or-later

ansible_collections/serverscom/sc_api/plugins/module_utils/modules.py

@@ -421,9 +421,12 @@ def get_drives_layout(layout, template):
             {"slot_positions": [0, 1], "raid": 1, "partitions": partitions_template}
         ]
         raid0_simple = [
-            {"slot_positions": [0], "raid": 0, "partitions": partitions_template}
+            {"slot_positions": [0, 1], "raid": 0, "partitions": partitions_template}
         ]
-        templates = {"raid1-simple": rai1_simple, "raid0-simple": raid0_simple}
+        no_raid = [
+            {"slot_positions": [0], "partitions": partitions_template}
+        ]
+        templates = {"raid1-simple": rai1_simple, "raid0-simple": raid0_simple, "no-raid": no_raid}
         if layout:
             return layout
         if template not in templates:

ansible_collections/serverscom/sc_api/plugins/modules/sc_dedicated_server_reinstall.py

@@ -61,15 +61,16 @@
 
     drives_layout_template:
         type: str
-        choices: [raid1-simple, raid0-simple]
+        choices: [raid1-simple, raid0-simple, no-raid]
         description:
             - Mutually exclusive with I(drives_layout).
             - Provides a template to use instead of I(drives_layout).
             - C(raid1-simple) uses two first drives to create RAID1,
               partition /boot (1Gb), swap (4Gb) and / (all other space).
-            - C(raid0-simple) uses first drive as raid0 (or no raid in case
-              of servers without hardware raid), and places /boot, swap
-              and / on this drive.
+            - C(raid0-simple) uses first two drives to create RAID0,
+              partition /boot (1Gb), swap (4Gb) and / (all other space).
+            - C(no-raid) uses first drive, does not create any RAID,
+              partition /boot (1Gb), swap (4Gb) and / (all other space).
             - This option is implemented by this module (it generates layout
               for drives['layout'] request to API based on built-in template).
 
@@ -447,7 +448,7 @@ def main():
             "hostname": {"type": "str"},
             "drives_layout_template": {
                 "type": "str",
-                "choices": ["raid1-simple", "raid0-simple"],
+                "choices": ["raid1-simple", "raid0-simple", "no-raid"],
             },
             "drives_layout": {"type": "list", "elements": "dict"},
             "operating_system_id": {"type": "int"},

ansible_collections/serverscom/sc_api/tests/integration/targets/sc_dedicated_server_reinstall_long/tasks/main.yaml

@@ -155,3 +155,24 @@
       - test6.id == existing_server1_id
       - test6.power_status == "powered_on"
       - test6.title == "raid0test"
+
+- name: Test7, reinstall with no-raid_template and OS name
+  sc_dedicated_server_reinstall:
+    token: '{{ sc_token }}'
+    endpoint: '{{ sc_endpoint }}'
+    id: '{{ existing_server1_id }}'
+    drives_layout_template: no-raid
+    operating_system_regex: "^Debian 12 (.*)x86_64$"
+    hostname: noraidtest
+    ssh_key_name: amarao
+    wait: 3600
+    update_interval: 30
+  register: test7
+
+- name: Check Test7
+  assert:
+    that:
+      - test7 is changed
+      - test7.id == existing_server1_id
+      - test7.power_status == "powered_on"
+      - test7.title == "noraidtest"