majic-ansible-roles Changeset

Changeset - 68c15461075c

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Branko Majic (branko) - 9 months ago 2023-08-09 00:38:04
branko@majic.rs

MAR-181: Dropp support for Debian 9 Stretch from the common role:

- Drop platform name from all helper VMs.
- Switch to using IPs from VirtualBox default allowed host-only
network subnets.

5 files changed with 15 insertions and 45 deletions:

roles/common/molecule/default/group_vars/parameters-optional.yml

roles/common/molecule/default/molecule.yml

roles/common/molecule/default/prepare.yml

roles/common/molecule/default/tests/test_maintenance_from_allowed_client.py

roles/common/molecule/default/tests/test_maintenance_from_disallowed_client.py

0 comments (0 inline, 0 general)

roles/common/molecule/default/group_vars/parameters-optional.yml

➞

Show inline comments

 ---
 enable_backup: true
-apt_proxy: "http://10.31.127.2:3142/"
+apt_proxy: "http://192.168.56.2:3142/"
 os_users:
   - name: user1
   - name: user2

roles/common/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -14,62 +14,38 @@ lint: @@
 platforms:
   - name: helper
-    box: debian/contrib-stretch64
+    box: debian/contrib-buster64
     memory: 512
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.2
+        ip: 192.168.56.2
         network_name: private_network
         type: static
-  - name: client1-stretch64
   - name: client1
     groups:
       - client
       - client-allowed
-    box: debian/contrib-stretch64
+    box: debian/contrib-buster64
     memory: 256
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.3
+        ip: 192.168.56.3
         network_name: private_network
         type: static
-  - name: client2-stretch64
   - name: client2
     groups:
       - client
       - client-disallowed
     box: debian/contrib-stretch64
     memory: 256
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.4
         network_name: private_network
         type: static
   - name: parameters-mandatory-stretch64
     groups:
       - parameters-mandatory
     box: debian/contrib-stretch64
     memory: 256
     cpus: 1
     interfaces:
       - auto_config: true
         ip: 10.31.127.11
         network_name: private_network
         type: static
   - name: parameters-optional-stretch64
     groups:
       - parameters-optional
     box: debian/contrib-stretch64
     box: debian/contrib-buster64
     memory: 256
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.12
+        ip: 192.168.56.4
         network_name: private_network
         type: static
@@ @@ -81,7 +57,7 @@ platforms: @@
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.21
+        ip: 192.168.56.21
         network_name: private_network
         type: static
@@ @@ -93,7 +69,7 @@ platforms: @@
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.22
+        ip: 192.168.56.22
         network_name: private_network
         type: static

roles/common/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -70,10 +70,8 @@ @@
         mode: 0644
         state: present
       with_dict:
 .31.127.11: parameters-mandatory-stretch64
 .31.127.12: parameters-optional-stretch64
 .31.127.21: parameters-mandatory-buster64
 .31.127.22: parameters-optional-buster64
 .168.56.21: parameters-mandatory-buster64
 .168.56.22: parameters-optional-buster64
 - hosts: parameters-mandatory,parameters-optional
   become: true
@@ @@ -94,8 +92,8 @@ @@
         mode: 0644
         state: present
       with_dict:
 .31.127.3: client1
 .31.127.4: client2
 .168.56.3: client1
 .168.56.4: client2
 - hosts: parameters-mandatory,parameters-optional
   become: true

roles/common/molecule/default/tests/test_maintenance_from_allowed_client.py

➞

Show inline comments

 @pytest.mark.parametrize("platform", [
     "stretch64",
     "buster64"
 ])
 def test_ssh_connectivity(host, platform):
@@ @@ -28,7 +27,6 @@ def test_ssh_connectivity(host, platform): @@
 @pytest.mark.parametrize("platform", [
     "stretch64",
     "buster64"
 ])
 def test_http_connectivity(host, platform):

roles/common/molecule/default/tests/test_maintenance_from_disallowed_client.py

➞

Show inline comments

 @pytest.mark.parametrize("platform", [
     "stretch64",
     "buster64"
 ])
 def test_ssh_connectivity(host, platform):
@@ @@ -28,7 +27,6 @@ def test_ssh_connectivity(host, platform): @@
 @pytest.mark.parametrize("platform", [
     "stretch64",
     "buster64"
 ])
 def test_http_connectivity(host, platform):

0 comments (0 inline, 0 general)