WIP

playbooks/roles/edxlocal/tasks/main.yml

@@ -20,7 +20,7 @@
   mysql_user:
     name: "{{ item.user }}"
     password: "{{ item.pass }}"
-    host: "{{ item.host }}"
+    host: "{{ EDXLOCAL_MYSQL_ALLOWED_HOST }}"
     priv: "{{ item.db }}.*:ALL"
     append_privs: yes
   when: item.db != None and item.db != ''
@@ -30,7 +30,7 @@
   mysql_user:
     name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
     password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
-    host: "{{ item.host }}"
+    host: "{{ EDXLOCAL_MYSQL_ALLOWED_HOST }}"
     priv: "{{ item }}.*:ALL"
     append_privs: yes
   when: item != None and item != ''
@@ -40,6 +40,7 @@
   mysql_user:
     name: "api001"
     password: "{{ ANALYTICS_API_DATABASES.default.PASSWORD }}"
+    host: "{{ EDXLOCAL_MYSQL_ALLOWED_HOST }}"
     priv: '{{ ANALYTICS_API_DATABASES.default.NAME }}.*:ALL/reports.*:SELECT'
   when: ANALYTICS_API_SERVICE_CONFIG is defined
 
@@ -47,6 +48,7 @@
   mysql_user:
     name: reports001
     password: "{{ ANALYTICS_API_DATABASES.reports.PASSWORD }}"
+    host: "{{ EDXLOCAL_MYSQL_ALLOWED_HOST }}"
     priv: '{{ ANALYTICS_API_DATABASES.reports.NAME }}.*:SELECT'
   when: ANALYTICS_API_SERVICE_CONFIG is defined
 
@@ -61,6 +63,7 @@
   mysql_user:
     name: "{{ EDX_NOTES_API_MYSQL_DB_USER }}"
     password: "{{ EDX_NOTES_API_MYSQL_DB_PASS }}"
+    host: "{{ EDXLOCAL_MYSQL_ALLOWED_HOST }}"
     priv: "{{ EDX_NOTES_API_MYSQL_DB_NAME }}.*:SELECT,INSERT,UPDATE,DELETE"
   when: EDX_NOTES_API_MYSQL_DB_USER is defined
 
@@ -69,10 +72,12 @@
   mysql_user:
     name: "{{ COMMON_MYSQL_READ_ONLY_USER }}"
     password: "{{ COMMON_MYSQL_READ_ONLY_PASS }}"
+    host: "{{ EDXLOCAL_MYSQL_ALLOWED_HOST }}"
     priv: "*.*:ALL"
 
 - name: setup the admin db user
   mysql_user:
     name: "{{ COMMON_MYSQL_ADMIN_USER }}"
     password: "{{ COMMON_MYSQL_ADMIN_PASS }}"
+    host: "{{ EDXLOCAL_MYSQL_ALLOWED_HOST }}"
     priv: "*.*:CREATE USER"

playbooks/small_deployments/edx-datastores.yml

@@ -10,6 +10,9 @@
   gather_facts: True
   vars:
     MYSQL_BIND_ADDRESS: "0.0.0.0"
+#    EDXLOCAL_MYSQL_ALLOWED_HOST: "{{ hostvars['stateless'][0]['ansible_hostname'] }}"
+    EDXLOCAL_MYSQL_ALLOWED_HOST: "ip-192-168-0-160.ec2.internal"
+#    rabbitmq_ip: "{{ groups['datastores'][0] }}"
   vars_files:
     - "../roles/edxapp/defaults/main.yml"
     - "../roles/forum/defaults/main.yml"
@@ -18,13 +21,13 @@
     - "../roles/ecomworker/defaults/main.yml"
   roles:
     # This install mysql and creates users.
-    - role: edxlocal
     - role: memcache
     - role: mongo
-    - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
-    - oraclejdk
+    - role: rabbitmq
+    - role: oraclejdk
     - role: elasticsearch
-    - edx_ansible
+    - role: edxlocal
+    - role: edx_ansible
     - role: datadog
       when: COMMON_ENABLE_DATADOG
     - role: splunkforwarder

playbooks/small_deployments/edx-stateless.yml

@@ -19,7 +19,8 @@
     EDXAPP_ELASTIC_SEARCH_CONFIG:
       - host: "{{ groups['datastores'][0] }}"
         port: 9200
-    EDXAPP_MEMCACHE: ["{{ groups['datastores'][0] }}"]
+    EDXAPP_MEMCACHE: ["{{ groups['datastores'][0] }}:11211"]
+    EDXAPP_RABBIT_HOSTNAME: "{{ groups['datastores'][0] }}"
     FORUM_MONGO_HOSTS: "{{ groups['datastores'] }}"
     FORUM_ELASTICSEARCH_HOST: "{{ groups['datastores'][0] }}"
     XQUEUE_RABBITMQ_HOSTNAME: "{{ groups['datastores'][0] }}"