Merge branch 'master' into master

tests/ansible.cfg

@@ -10,3 +10,4 @@ fact_caching_connection = /tmp
 stdout_callback = skippy
 library = ./library:../library
 callback_whitelist = profile_tasks
+jinja2_extensions = jinja2.ext.do

tests/files/gce_centos7-flannel-addons.yml

@@ -18,3 +18,5 @@ cloud_provider: gce
 kube_encrypt_secret_data: true
 prometheus_operator_enabled: true
 k8s_metrics_enabled: true
+ingress_nginx_enabled: true
+cert_manager_enabled: true