rebase conflict resolution

playbooks/roles/common_vars/defaults/main.yml

@@ -30,6 +30,7 @@ common_directories:
   - path: "{{ COMMON_APP_DIR }}"
   - path: "{{ COMMON_BIN_DIR }}"
   - path: "{{ COMMON_CFG_DIR }}"
+  - path: "{{ COMMON_CFG_DIR }}/inventory.d"    
   - path: "{{ COMMON_LOG_DIR }}"
     owner: "{{ common_log_user }}"
     group: "{{ common_log_user }}"

playbooks/roles/edx_service/defaults/main.yml

@@ -16,6 +16,30 @@
 #
 edx_service_name: edx_service
 
+edx_service_inventory:
+  meta:
+    configured_at: "{{ ansible_date_time.iso8601_micro }}"
+    configured_by: "{{ ansible_user_id }}"
+  service:
+    edx_service_name: "{{ edx_service_name }}"
+    edx_service_home: "{{ edx_service_home }}"
+    edx_service_repos: "{{ service_src_repos.function_output }}"
+    edx_service_packages: "{{ edx_service_packages }}"
+  ansible:
+    ansible_distribution: "{{ ansible_distribution }}"
+    ansible_distribution_release: "{{ ansible_distribution_release }}"
+    ansible_distribution_version: "{{ ansible_distribution_version }}"
+    ansible_product_version: "{{ ansible_product_version }}"
+    ansible_python_version: "{{ ansible_python_version }}"
+    ansible_selinux: "{{ ansible_selinux }}"
+    ansible_swapfree_mb: "{{ ansible_swapfree_mb }}"
+    ansible_system: "{{ ansible_system }}"
+    ansible_userspace_architecture: "{{ ansible_userspace_architecture }}"
+    ansible_userspace_bits: "{{ ansible_userspace_bits }}"
+    ansible_virtualization_role: "{{ ansible_virtualization_role }}"
+    ansible_virtualization_type: "{{ ansible_virtualization_type }}"
+
+    
 #
 # OS packages
 #

playbooks/roles/edx_service/tasks/main.yml

@@ -183,6 +183,36 @@
     - install
     - install:code
 
+- name: build repo urls for inventory
+  debug: msg={{ item.PROTOCOL }}://{{ [ item.DOMAIN, item.REPO] | join("/") }}@{{ item.VERSION }}
+  with_items: edx_service_repos
+  register: output
+  tags:
+    - install
+    - install:code
+
+# Late bound variable referenced in defaults/main.yml
+- name: transform registered dicts to list of repos
+  util_map:
+    function: zip_to_list
+    input: "{{ output.results }}"
+    args: ['msg']
+  register: service_src_repos
+  tags:
+    - install
+    - install:code
+  
+- name: write out inventory
+  template: >
+    src=edx/etc/inventory.d/inventory.yml.j2
+    dest={{ COMMON_CFG_DIR  }}/inventory.d/{{ edx_service_name }}.yml
+    mode=0644
+  tags:
+    - deploy
+    - install
+    - install:code
+  when: edx_service_inventory is defined
+
 - name: get instance information
   action: ec2_facts
   tags: