Move repos data out of service_config

playbooks/roles/edx-notes-api/defaults/main.yml

@@ -39,6 +39,14 @@ EDX_NOTES_API_DATABASES:
 EDX_NOTES_API_ALLOWED_HOSTS:
   - localhost
 
+EDX_NOTES_API_REPOS:
+  - PROTOCOL: "{{COMMON_GIT_PROTOCOL}}"
+    DOMAIN: "{{COMMON_GIT_MIRROR}}"
+    PATH: "{{COMMON_GIT_PATH}}"
+    REPO: edx-notes-api.git
+    VERSION: e0d/migration-overrides
+    DESTINATION: "{{edx_notes_api_code_dir}}"
+
 #
 # This data structure will be written out to yaml configuration file
 # in /edx/etc
@@ -65,13 +73,7 @@ edx_notes_api_service_config:
       URL: "{{ EDX_NOTES_API_ELASTICSEARCH_URL }}"
       INDEX_NAME: '{{ EDX_NOTES_API_DATASTORE_NAME }}'
   DISABLE_TOKEN_CHECK: True
-  GIT:
-    - PROTOCOL: "{{COMMON_GIT_PROTOCOL}}"
-      DOMAIN: "{{COMMON_GIT_MIRROR}}"
-      PATH: "{{COMMON_GIT_PATH}}"
-      REPO: edx-notes-api.git
-      VERSION: e0d/migration-overrides
-      DESTINATION: "{{edx_notes_api_code_dir}}"
+
 #
 # vars are namespace with the module name.
 #

playbooks/roles/edx-notes-api/meta/main.yml

@@ -24,4 +24,5 @@ dependencies:
     edx_role_name: "{{ edx_notes_api_role_name }}"
     edx_service_name: "{{ edx_notes_api_service_name }}"
     edx_service_config: "{{ edx_notes_api_service_config }}"
+    edx_service_repos: "{{ edx_notes_api_repos }}"
   - supervisor

playbooks/roles/edx_service/tasks/main.yml

@@ -93,7 +93,7 @@
 - name: check if git repo exists before pruning
   stat: path={{ item.DESTINATION }}/.git
   register: git_dir_exists
-  with_items: edx_service_config.GIT
+  with_items: edx_service_repos
 
 - name: git prune before checking out
   shell: cd {{ item.0.DESTINATION }} && git remote prune origin
@@ -103,14 +103,14 @@
     (item.1.stat.isdir is defined) and
     item.1.stat.isdir
   with_together:
-    - edx_service_config.GIT
+    - edx_service_repos
     - git_dir_exists.results
 
 
 - name: validate GIT.PROTOCOL
   fail: msg='GIT.PROTOCOL must be "https" or "ssh"'
   when: (item.PROTOCOL != "https") and (item.PROTOCOL != "ssh")
-  with_items: edx_service_config.GIT
+  with_items: edx_service_repos
 
 - name: checkout code over ssh
   git: >
@@ -120,7 +120,7 @@
   sudo_user: "{{ edx_role_name }}"
   register: code_checkout
   when: item.PROTOCOL == "ssh"
-  with_items: edx_service_config.GIT
+  with_items: edx_service_repos
 
 - name: checkout code over https
   git: >
@@ -129,7 +129,7 @@
   sudo_user: "{{ edx_role_name }}"
   register: code_checkout
   when: item.PROTOCOL == "https"
-  with_items: edx_service_config.GIT
+  with_items: edx_service_repos
 
 
 - name: get instance information
@@ -143,7 +143,7 @@
       "version:{{edx_service_name}}" : "{{ item.0.DOMAIN }}/{{ item.0.PATH }}/{{ item.0.REPO }} {{ item.1.after |truncate(7,True,'') }}"
   when: item.1.after is defined
   with_together: 
-    - edx_service_config.GIT
+    - edx_service_repos
     - code_checkout.results
 
 #TODO: restart supervisor- depends on supervisor being refactored into this role