Merge pull request #2901 from edx/bilal_cleanup

cleaning up my mistake

playbooks/roles/nginx/defaults/main.yml

@@ -11,7 +11,7 @@ NGINX_EDXAPP_EXTRA_CONFIGS: []
 NGINX_EDXAPP_CUSTOM_REDIRECTS: {}
 
 # Override these vars for adding user to nginx.htpasswd
-NGINXUSERS:
+NGINX_USERS:
   - name: "{{ COMMON_HTPASSWD_USER }}"
     password: "{{ COMMON_HTPASSWD_PASS }}"
     state: present

playbooks/roles/nginx/tasks/main.yml

@@ -231,7 +231,7 @@
   tags:
     - install
     - install:configuration
-  with_items: NGINXUSERS
+  with_items: NGINX_USERS
 
 - name: Create nginx log file location (just in case)
   file: >

util/jenkins/ansible-provision.sh

@@ -230,6 +230,12 @@ EOF_AUTH
 
 fi
 
+if [[ -n $nginx_users ]]; then
+   cat << EOF_AUTH >> $extra_vars_file
+NGINX_USERS: $nginx_users
+EOF_AUTH
+fi
+
 if [[ $enable_client_profiling == "true" ]]; then
     cat << EOF_PROFILING >> $extra_vars_file
 EDXAPP_SESSION_SAVE_EVERY_REQUEST: True
@@ -268,8 +274,6 @@ SANDBOX_USERNAME: $github_username
 EDXAPP_ECOMMERCE_PUBLIC_URL_ROOT: "https://ecommerce-${deploy_host}"
 EDXAPP_ECOMMERCE_API_URL: "https://ecommerce-${deploy_host}/api/v2"
 
-NGINXUSERS: $nginx_users
-
 ECOMMERCE_ECOMMERCE_URL_ROOT: "https://ecommerce-${deploy_host}"
 ECOMMERCE_LMS_URL_ROOT: "https://${deploy_host}"
 ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: true