diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 8ddb51f63361231fcc8598ba2f7c4ae36a0489b0..822b02a4330d61a60af5547f9023a1041a5cb0ce 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1472,7 +1472,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 9 (Stretch) - Debian 10 (Buster) diff --git a/roles/web_server/defaults/main.yml b/roles/web_server/defaults/main.yml index 60a2304484423c214a452624bf8511c43cba243b..1875432a2ad9f10babfa4ec97c64c3803ac92b23 100644 --- a/roles/web_server/defaults/main.yml +++ b/roles/web_server/defaults/main.yml @@ -15,11 +15,9 @@ ECDHE-RSA-CHACHA20-POLY1305:\ # Internal parameters php_fpm_service_name_per_release: - stretch: "php7.0-fpm" buster: "php7.3-fpm" php_base_config_dir_per_release: - stretch: "/etc/php/7.0" buster: "/etc/php/7.3" php_fpm_package_name: "php-fpm" diff --git a/roles/web_server/meta/main.yml b/roles/web_server/meta/main.yml index c3c5e8ce9b562703d651dcf84f7d2111ef3cdd37..ac62c3880ddfa5f8c47a80f8e1de029d891ae7ac 100644 --- a/roles/web_server/meta/main.yml +++ b/roles/web_server/meta/main.yml @@ -11,5 +11,4 @@ galaxy_info: platforms: - name: Debian versions: - - 9 - 10 diff --git a/roles/web_server/molecule/default/molecule.yml b/roles/web_server/molecule/default/molecule.yml index 35080b25a761229a0b80d97b993d6afac38732e9..984a67f960c2070d18f906ce03cea58132605b08 100644 --- a/roles/web_server/molecule/default/molecule.yml +++ b/roles/web_server/molecule/default/molecule.yml @@ -14,45 +14,6 @@ lint: platforms: - - name: client1-stretch - groups: - - client - - stretch - box: debian/contrib-stretch64 - memory: 256 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.21 - network_name: private_network - type: static - - - name: parameters-mandatory-stretch64 - groups: - - parameters-mandatory - - stretch - box: debian/contrib-stretch64 - memory: 512 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.32 - network_name: private_network - type: static - - - name: parameters-optional-stretch64 - groups: - - parameters-optional - - stretch - box: debian/contrib-stretch64 - memory: 512 - cpus: 1 - interfaces: - - auto_config: true - ip: 10.31.127.33 - network_name: private_network - type: static - - name: client1-buster groups: - client @@ -62,7 +23,7 @@ platforms: cpus: 1 interfaces: - auto_config: true - ip: 10.31.127.20 + ip: 192.168.56.20 network_name: private_network type: static @@ -75,7 +36,7 @@ platforms: cpus: 1 interfaces: - auto_config: true - ip: 10.31.127.30 + ip: 192.168.56.30 network_name: private_network type: static @@ -88,7 +49,7 @@ platforms: cpus: 1 interfaces: - auto_config: true - ip: 10.31.127.31 + ip: 192.168.56.31 network_name: private_network type: static diff --git a/roles/web_server/molecule/default/prepare.yml b/roles/web_server/molecule/default/prepare.yml index b4d50897c455d4f3158ae1edd8effa4832d0e976..f8a0537cb0faf9575ee831015a9bbda42e5e42e0 100644 --- a/roles/web_server/molecule/default/prepare.yml +++ b/roles/web_server/molecule/default/prepare.yml @@ -23,10 +23,6 @@ - "{{ item.name }}" - "{{ item.fqdn }}" with_items: - - name: parameters-mandatory-stretch64_https - fqdn: parameters-mandatory - - name: parameters-optional-stretch64_https - fqdn: parameters-optional - name: parameters-mandatory-buster64_https fqdn: parameters-mandatory - name: parameters-optional-buster64_https @@ -63,29 +59,6 @@ - nmap state: present -- hosts: stretch - become: true - tasks: - - - name: Set-up the hosts file - lineinfile: - path: /etc/hosts - regexp: "^{{ item.key }}" - line: "{{ item.key }} {{ item.value }}" - owner: root - group: root - mode: 0644 - state: present - with_dict: - 10.31.127.21: "client1" - 10.31.127.32: "parameters-mandatory" - 10.31.127.33: "parameters-optional" - - - name: Install curl for testing redirects and webpage content - apt: - name: curl - state: present - - hosts: buster become: true tasks: @@ -100,9 +73,9 @@ mode: 0644 state: present with_dict: - 10.31.127.20: "client1" - 10.31.127.30: "parameters-mandatory" - 10.31.127.31: "parameters-optional" + 192.168.56.20: "client1" + 192.168.56.30: "parameters-mandatory" + 192.168.56.31: "parameters-optional" - name: Install curl for testing redirects and webpage content apt: diff --git a/roles/web_server/molecule/default/tests/conftest.py b/roles/web_server/molecule/default/tests/conftest.py index 44c9df0434177d38ba64cb92e1261b70ee949884..e31d2b8ccccd0d6302e2bebe85060ae012f21c3d 100644 --- a/roles/web_server/molecule/default/tests/conftest.py +++ b/roles/web_server/molecule/default/tests/conftest.py @@ -12,7 +12,6 @@ def php_info(host): Currently supports: - - Debian 9 (Stretch) - Debian 10 (Buster) Resulting information can be accessed through returned named tuple @@ -28,9 +27,7 @@ def php_info(host): ansible_facts = host.ansible("setup")["ansible_facts"] ansible_distribution_release = ansible_facts['ansible_distribution_release'] - if ansible_distribution_release == 'stretch': - info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.0-fpm', base_config_dir='/etc/php/7.0') - elif ansible_distribution_release == 'buster': + if ansible_distribution_release == 'buster': info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.3-fpm', base_config_dir='/etc/php/7.3') else: raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)