majic-ansible-roles Changeset

Changeset - a0597f1f2578

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Branko Majic (branko) - 20 days ago 2024-08-30 14:00:03
branko@majic.rs

MAR-239: Dropped support for Debian 11 Bullseye from the common role.

4 files changed with 2 insertions and 62 deletions:

roles/bootstrap/molecule/default/molecule.yml

roles/common/molecule/default/molecule.yml

roles/common/molecule/default/prepare.yml

roles/common/tasks/main.yml

0 comments (0 inline, 0 general)

roles/bootstrap/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -5,42 +5,24 @@ dependency: {} @@
 driver:
   name: vagrant
   provider:
     name: virtualbox
 lint:
   name: yamllint
   options:
     config-file: ../../.yamllint.yml
 platforms:
   - name: parameters-mandatory-bullseye
     groups:
       - parameters-mandatory
     box: debian/bullseye64
     memory: 256
     cpus: 1
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
   - name: parameters-optional-bullseye
     groups:
       - parameters-optional
     box: debian/bullseye64
     memory: 256
     cpus: 1
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
   - name: parameters-mandatory-bookworm
     groups:
       - parameters-mandatory
     box: debian/bookworm64
     memory: 256
     cpus: 1
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
   - name: parameters-optional-bookworm
     groups:
       - parameters-optional

roles/common/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -61,62 +61,24 @@ platforms: @@
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
     interfaces:
       - auto_config: true
         ip: 192.168.56.4
         network_name: private_network
         type: static
       - auto_config: true
         ip: fd00::192:168:56:4
         network_name: private_network
         netmask: 116
         type: static
   - name: parameters-mandatory-bullseye
     groups:
       - parameters-mandatory
     box: debian/bullseye64
     memory: 256
     cpus: 1
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
     interfaces:
       - auto_config: true
         ip: 192.168.56.31
         network_name: private_network
         type: static
       - auto_config: true
         ip: fd00::192:168:56:31
         network_name: private_network
         netmask: 116
         type: static
   - name: parameters-optional-bullseye
     groups:
       - parameters-optional
     box: debian/bullseye64
     memory: 256
     cpus: 1
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
     interfaces:
       - auto_config: true
         ip: 192.168.56.32
         network_name: private_network
         type: static
       - auto_config: true
         ip: fd00::192:168:56:32
         network_name: private_network
         netmask: 116
         type: static
   - name: parameters-mandatory-bookworm
     groups:
       - parameters-mandatory
     box: debian/bookworm64
     memory: 384
     cpus: 1
     provider_raw_config_args:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
     interfaces:
       - auto_config: true
         ip: 192.168.56.21
         network_name: private_network

roles/common/molecule/default/prepare.yml

➞

Show inline comments

@@ @@ -61,28 +61,24 @@ @@
         state: present
     - name: Set-up /etc/hosts with entries for all servers
       lineinfile:
         path: /etc/hosts
         regexp: "^{{ item.key }}"
         line: "{{ item.key }} {{ item.value }}"
         owner: root
         group: root
         mode: 0644
         state: present
       with_dict:
 .168.56.31: parameters-mandatory-bullseye
 .168.56.32: parameters-optional-bullseye
         fd00::192:168:56:31: parameters-mandatory-bullseye
         fd00::192:168:56:32: parameters-optional-bullseye
 .168.56.21: parameters-mandatory-bookworm
 .168.56.22: parameters-optional-bookworm
         fd00::192:168:56:21: parameters-mandatory-bookworm
         fd00::192:168:56:22: parameters-optional-bookworm
 - hosts: parameters-mandatory,parameters-optional
   become: true
   tasks:
     - name: Set-up /etc/hosts with entries for all servers
       lineinfile:
         path: /etc/hosts

roles/common/tasks/main.yml

➞

Show inline comments

@@ @@ -104,25 +104,25 @@ @@
 - name: Calculate stock checksum for bashrc root account
   stat:
     path: "/root/.bashrc"
   register: root_bashrc_stat
 - name: Replace stock bashrc for root account with skeleton one
   copy:
     src: "skel_bashrc"
     dest: "/root/.bashrc"
     owner: root
     group: root
     mode: 0640
-  # Checksums: bullseye and bookworm (same)
   # Checksums: bookworm
   when: |
     root_bashrc_stat.stat.checksum == "1a422a148ad225aa5ba33f8dafd2b7cfcdbd701f"
 - name: Install sudo
   apt:
     name: sudo
     state: present
 - name: Install ssl-cert package
   apt:
     name: ssl-cert
     state: present
@@ @@ -413,25 +413,25 @@ @@
     - "/var/lib/pipreqcheck"
     - "/var/lib/pipreqcheck/virtualenv"
 - name: Create Python virtual environment used for installing/running pip-tools
   command: "/usr/bin/virtualenv --python '{{ item.python_path }}' --prompt '{{ item.virtualenv_prompt }}' '{{ item.virtualenv_path }}'"
   args:
     creates: "{{ item.creates }}"
   become: true
   become_user: "pipreqcheck"
   with_items:
     - name: pipreqcheck
       virtualenv_path: "/var/lib/pipreqcheck/virtualenv"
-      virtualenv_prompt: "{% if ansible_distribution_release == 'bullseye' %}(pipreqcheck) {% else %}pipreqcheck{% endif %}"
       virtualenv_prompt: "pipreqcheck"
       python_path: "/usr/bin/python3"
       creates: "/var/lib/pipreqcheck/virtualenv/bin/python3"
 - name: Create directory for storing pip requirements files
   file:
     path: "{{ item }}"
     state: "directory"
     owner: root
     group: pipreqcheck
     mode: 0750
   with_items:
     - "/etc/pip_check_requirements_upgrades"

0 comments (0 inline, 0 general)