Merge pull request #1427 from fmyzjs/patch-1

use COMMON_HTPASSWD_USER and COMMON_HTPASSWD_PASS 

playbooks/roles/certs/defaults/main.yml

@@ -15,8 +15,8 @@ CERTS_QUEUE_URL: "http://localhost:18040"
 CERTS_BUCKET: ""
 # basic auth credentials for connecting
 # to the xqueue server
-CERTS_XQUEUE_AUTH_USER: "edx"
-CERTS_XQUEUE_AUTH_PASS: "edx"
+CERTS_XQUEUE_AUTH_USER: "{{ COMMON_HTPASSWD_USER }}"
+CERTS_XQUEUE_AUTH_PASS: "{{ COMMON_HTPASSWD_PASS }}"
 # credentials for connecting to the xqueue server
 CERTS_QUEUE_USER: "lms"
 CERTS_QUEUE_PASS: "password"

playbooks/roles/ora/defaults/main.yml

@@ -57,8 +57,8 @@ ORA_USERS:
 ORA_XQUEUE_URL: "http://localhost:18040"
 ORA_XQUEUE_DJANGO_USER: "lms"
 ORA_XQUEUE_DJANGO_PASSWORD: "password"
-ORA_XQUEUE_BASIC_AUTH_USER: "edx"
-ORA_XQUEUE_BASIC_AUTH_PASSWORD: "edx"
+ORA_XQUEUE_BASIC_AUTH_USER: "{{ COMMON_HTPASSWD_USER }}"
+ORA_XQUEUE_BASIC_AUTH_PASSWORD: "{{ COMMON_HTPASSWD_PASS }}"
 
 ORA_DJANGO_USER: "lms"
 ORA_DJANGO_PASSWORD: "password"