diff --git a/roles/web_server/molecule/default/tests/conftest.py b/roles/web_server/molecule/default/tests/conftest.py index 16b03deae6031b487f68202f508a376c4d62b629..d81cd069a323d5d7b4dbf07630418aeed55e0385 100644 --- a/roles/web_server/molecule/default/tests/conftest.py +++ b/roles/web_server/molecule/default/tests/conftest.py @@ -10,7 +10,7 @@ def php_info(host): name, PHP-FPM service name, and PHP base configuration directory is based on Debian release. - Currently supports Debian 8 (Jessie), and Debian 9 (Stretch). + Currently supports Debian 9 (Stretch). Resulting information can be accessed through returned named tuple with the following properties: @@ -25,9 +25,7 @@ def php_info(host): ansible_facts = host.ansible("setup")["ansible_facts"] ansible_distribution_release = ansible_facts['ansible_distribution_release'] - if ansible_distribution_release == 'jessie': - info = PHPInfo(fpm_package='php5-fpm', fpm_service='php5-fpm', base_config_dir='/etc/php5') - elif ansible_distribution_release == 'stretch': + if ansible_distribution_release == 'stretch': info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.0-fpm', base_config_dir='/etc/php/7.0') else: raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)