fix ansible 2.x error

playbooks/roles/analytics_pipeline/defaults/main.yml

@@ -12,9 +12,12 @@
 #
 
 ANALYTICS_PIPELINE_OUTPUT_DATABASE_NAME: "{{ ANALYTICS_API_REPORTS_DB_NAME }}"
+ANALYTICS_PIPELINE_OUTPUT_DATABASE_USER: 'pipeline001'
+ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD: 'password'
+
 ANALYTICS_PIPELINE_OUTPUT_DATABASE:
-  username: pipeline001
-  password: password
+  username: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_USER }}"
+  password: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD }}"
   host: localhost
   port: 3306
 

playbooks/roles/ecommerce/defaults/main.yml

@@ -21,14 +21,16 @@ ECOMMERCE_NGINX_PORT: "18130"
 ECOMMERCE_SSL_NGINX_PORT: 48130
 
 ECOMMERCE_DEFAULT_DB_NAME: 'ecommerce'
+ECOMMERCE_DATABASES_USER: 'ecomm001'
+ECOMMERCE_DATABASES_PASSWORD: 'password'
 
 ECOMMERCE_DATABASES:
   # rw user
   default:
     ENGINE: 'django.db.backends.mysql'
     NAME: '{{ ECOMMERCE_DEFAULT_DB_NAME }}'
-    USER: 'ecomm001'
-    PASSWORD: 'password'
+    USER: '{{ ECOMMERCE_DATABASES_USER }}'
+    PASSWORD: '{{ ECOMMERCE_DATABASES_PASSWORD }}'
     HOST: 'localhost'
     PORT: '3306'
     ATOMIC_REQUESTS: true

playbooks/roles/edxlocal/defaults/main.yml

@@ -19,11 +19,11 @@ edxlocal_databases:
 
 edxlocal_database_users:
   - db: "{{ ECOMMERCE_DEFAULT_DB_NAME | default(None) }}"
-    user: "{{ ECOMMERCE_DATABASES.default.USER | default(None) }}"
-    pass: "{{ ECOMMERCE_DATABASES.default.PASSWORD | default(None) }}"
+    user: "{{ ECOMMERCE_DATABASES_USER | default(None) }}"
+    pass: "{{ ECOMMERCE_DATABASES_PASSWORD | default(None) }}"
   - db: "{{ INSIGHTS_DATABASE_NAME | default(None) }}"
-    user: "{{ INSIGHTS_DATABASES.default.USER | default(None) }}"
-    pass: "{{ INSIGHTS_DATABASES.default.PASSWORD | default(None) }}"
+    user: "{{ INSIGHTS_DATABASE_USER | default(None) }}"
+    pass: "{{ INSIGHTS_DATABASE_PASSWORD | default(None) }}"
   - db: "{{ ORA_MYSQL_DB_NAME | default(None) }}"
     user: "{{ ORA_MYSQL_USER | default(None) }}"
     pass: "{{ ORA_MYSQL_PASSWORD | default(None) }}"
@@ -37,14 +37,14 @@ edxlocal_database_users:
     user: "{{ EDXAPP_MYSQL_CSMH_USER | default(None) }}"
     pass: "{{ EDXAPP_MYSQL_CSMH_PASSWORD | default(None) }}"
   - db: "{{ PROGRAMS_DEFAULT_DB_NAME | default(None) }}"
-    user: "{{ PROGRAMS_DATABASES.default.USER | default(None) }}"
-    pass: "{{ PROGRAMS_DATABASES.default.PASSWORD | default(None) }}"
+    user: "{{ PROGRAMS_DEFAULT_USER | default(None) }}"
+    pass: "{{ PROGRAMS_DEFAULT_PASSWORD | default(None) }}"
   - db: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_NAME | default(None) }}"
-    user: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE.username }}"
-    pass: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE.password }}"
+    user: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_USER  | default(None) }}"
+    pass: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD | default(None) }}"
   - db: "{{ HIVE_METASTORE_DATABASE_NAME | default(None) }}"
-    user: "{{ HIVE_METASTORE_DATABASE.user | default(None) }}"
-    pass: "{{ HIVE_METASTORE_DATABASE.password | default(None) }}"
+    user: "{{ HIVE_METASTORE_DATABASE_USER | default(None) }}"
+    pass: "{{ HIVE_METASTORE_DATABASE_PASSWORD | default(None) }}"
   - db: "{{ CREDENTIALS_DEFAULT_DB_NAME | default(None) }}"
     user: "{{ CREDENTIALS_MYSQL_USER | default(None) }}"
     pass: "{{ CREDENTIALS_MYSQL_PASSWORD | default(None) }}"

playbooks/roles/edxlocal/tasks/main.yml

@@ -25,7 +25,7 @@
     password: "{{ item.pass }}"
     priv: "{{ item.db }}.*:ALL"
     append_privs: yes
-  when: "{{ item.db }} != None and {{ item.db }} != ''"
+  when: item.db != None and item.db }} != ''
   with_items: "{{ edxlocal_database_users }}"
 
 - name: setup the migration db user

playbooks/roles/hive/defaults/main.yml

@@ -18,9 +18,12 @@ HIVE_CONF: "{{ HIVE_HOME }}/conf"
 HIVE_LIB: "{{ HIVE_HOME }}/lib"
 
 HIVE_METASTORE_DATABASE_NAME: edx_hive_metastore
+HIVE_METASTORE_DATABASE_USER: 'edx_hive'
+HIVE_METASTORE_DATABASE_PASSWORD: 'edx'
+
 HIVE_METASTORE_DATABASE:
-  user: edx_hive
-  password: edx
+  user: "{{ HIVE_METASTORE_DATABASE_USER }}"
+  password: "{{ HIVE_METASTORE_DATABASE_PASSWORD }}"
   name: "{{ HIVE_METASTORE_DATABASE_NAME }}"
   host: 127.0.0.1
   port: 3306

playbooks/roles/insights/defaults/main.yml

@@ -55,14 +55,16 @@ INSIGHTS_RESEARCH_URL: 'https://www.edx.org/research-pedagogy'
 INSIGHTS_OPEN_SOURCE_URL: 'http://set-me-please'
 
 INSIGHTS_DATABASE_NAME: 'dashboard'
+INSIGHTS_DATABASE_USER: 'rosencrantz'
+INSIGHTS_DATABASE_PASSWORD: 'secret'
 
 INSIGHTS_DATABASES:
   # rw user
   default:
     ENGINE: 'django.db.backends.mysql'
     NAME: '{{ INSIGHTS_DATABASE_NAME }}'
-    USER: 'rosencrantz'
-    PASSWORD: 'secret'
+    USER: '{{ INSIGHTS_DATABASE_USER }}'
+    PASSWORD: '{{ INSIGHTS_DATABASE_PASSWORD }}'
     HOST: '127.0.0.1'
     PORT: '3306'
 

playbooks/roles/programs/defaults/main.yml

@@ -20,14 +20,16 @@ PROGRAMS_NGINX_PORT: 18140
 PROGRAMS_SSL_NGINX_PORT: 48140
 
 PROGRAMS_DEFAULT_DB_NAME: 'programs'
+PROGRAMS_DEFAULT_USER: 'programs001'
+PROGRAMS_DEFAULT_PASSWORD: 'password'
 
 PROGRAMS_DATABASES:
   # rw user
   default:
     ENGINE: 'django.db.backends.mysql'
     NAME: '{{ PROGRAMS_DEFAULT_DB_NAME }}'
-    USER: 'programs001'
-    PASSWORD: 'password'
+    USER: '{{ PROGRAMS_DEFAULT_USER }}'
+    PASSWORD: '{{ PROGRAMS_DEFAULT_PASSWORD }}'
     HOST: 'localhost'
     PORT: '3306'
     ATOMIC_REQUESTS: true