Try again on undefined default

ansible · Aug 30, 2017 · de92898 · de92898
1 parent 48ec7c9
commit de92898
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/test/roles/validate-build-and-import/templates/Dockerfile.j2 b/test/roles/validate-build-and-import/templates/Dockerfile.j2
@@ -25,11 +25,11 @@ RUN ["chmod", "755", "/usr/sbin/dumb-init"]
 
 # I am defaults
 ARG apache_port=8000
-ARG apache_pid_file={{ distro.httpd_pid_file }}
-ARG apache_run_user={{ distro.httpd_user }}
-ARG apache_run_group={{ distro.httpd_run_group }}
-ARG apache_log_dir={{ distro.httpd_logdir }}
-ARG apache_lock_dir={{ distro.httpd_lock_dir }}
+ARG apache_pid_file={{ distro.template.httpd_pid_file }}
+ARG apache_run_user={{ distro.template.httpd_user }}
+ARG apache_run_group={{ distro.template.httpd_run_group }}
+ARG apache_log_dir={{ distro.template.httpd_logdir }}
+ARG apache_lock_dir={{ distro.template.httpd_lock_dir }}
 ENV APACHE_PORT=${apache_port}
 ENV APACHE_PID_FILE=${apache_pid_file}
 ENV APACHE_RUN_USER=${apache_run_user}

diff --git a/test/run_tests.yml b/test/run_tests.yml
@@ -14,8 +14,11 @@
         httpd_pageroot: "/var/www/html/"
         httpd_logdir: "/var/log/httpd"
         httpd_rundir: "/run/httpd"
+        httpd_pid_file: "/run/httpd/httpd.pid"
         httpd_bin: "/usr/sbin/httpd"
         httpd_user: "apache"
+        httpd_run_group: "apache"
+        httpd_lock_dir: "/run/httpd"
       debian: &debian
         package_update_command: "apt-get update -y"
         httpd_install_command: "apt-get install -y apache2"
@@ -24,8 +27,11 @@
         httpd_pageroot: "/var/www/html/"
         httpd_logdir: "/var/log/apache2"
         httpd_rundir: "/run/apache2"
+        httpd_pid_file: "/var/run/apache2/apache2.pid"
         httpd_bin: "/usr/sbin/apache2"
         httpd_user: "www-data"
+        httpd_run_group: "www-data"
+        httpd_lock_dir: "/var/run/apache2"
       alpine: &alpine
         package_update_command: "apk update"
         httpd_install_command: "apk add tar apache2"
@@ -34,8 +40,11 @@
         httpd_pageroot: "/var/www/localhost/htdocs/"
         httpd_logdir: "/var/log/httpd"
         httpd_rundir: "/run/apache2"
+        httpd_pid_file: "/run/apache2/apache2.pid"
         httpd_bin: "/usr/sbin/httpd"
         httpd_user: "apache"
+        httpd_run_group: "apache"
+        httpd_lock_dir: "/run/apache2"
     distros:
       - name: "centos-7"
         base_image: "centos:7"