Integrate edx_service role

playbooks/roles/minos/defaults/main.yml

@@ -12,17 +12,22 @@
 # 
 MINOS_GIT_IDENTITY: !!null
 
+MINOS_SERVICE_CONFIG:
+  aws_profile: !!null
+  s3_bucket: edx-{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}
+  bucket_path: lifecycle/minos
+  voter_conf_d: "{{ minos_voter_cfg }}"
+
 #
 # vars are namespace with the module name.
 #
-minos_role_name: minos
-minos_service_name: "{{ minos_role_name }}"
-minos_data_dir: "{{ COMMON_DATA_DIR }}/minos"
-minos_app_dir: "{{ COMMON_APP_DIR }}/minos"
+minos_service_name: minos
+minos_data_dir: "{{ COMMON_DATA_DIR }}/{{ minos_service_name }}"
+minos_app_dir: "{{ COMMON_APP_DIR }}/{{ minos_service_name }}"
 minos_venv_dir: "{{ minos_app_dir }}/venvs/"
-minos_log_dir: "{{ COMMON_LOG_DIR }}/minos"
-minos_cfg_file: "{{ COMMON_CFG_DIR }}/minos/minos.yml"
-minos_voter_cfg: "{{ COMMON_CFG_DIR }}/minos/conf.d/"
+minos_log_dir: "{{ COMMON_LOG_DIR }}/{{ minos_service_name }}"
+minos_cfg_file: "{{ COMMON_CFG_DIR }}/{{ minos_service_name }}/minos.yml"
+minos_voter_cfg: "{{ COMMON_CFG_DIR }}/{{ minos_service_name }}/conf.d/"
 minos_git_ssh: "/tmp/git.sh"
 minos_git_identity: "{{ minos_app_dir }}/minos-git-identity"
 minos_edx_server_tools_repo: "git@github.com/edx-ops/edx-minos.git"

playbooks/roles/minos/meta/main.yml

@@ -20,5 +20,7 @@
 # }
 dependencies:
   - role: edx_service
-    edx_role_name: "{{ minos_role_name }}"
     edx_service_name: "{{ minos_service_name }}"
+    edx_service_config: "{{ MINOS_SERVICE_CONFIG }}"
+    edx_service_user: root
+    edx_service_home: "{{ minos_app_dir }}"
\ No newline at end of file

playbooks/roles/minos/tasks/main.yml

@@ -45,12 +45,6 @@
     group=root
     mode=0755
   
-- name: create minos config
-  template: >
-    dest={{ minos_cfg_file }}
-    src=edx/etc/minos/minos.yml.j2
-    mode=0755 owner=root group=root
-  
 - name: create minos voters configs
   template: >
     dest={{ minos_voter_cfg }}/{{ item }}.yml

playbooks/roles/minos/templates/edx/etc/minos/minos.yml.j2

----
-
-aws_profile: !!null
-s3_bucket: 'edx-{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}'
-bucket_path: 'lifecycle/minos'
-voter_conf_d: '{{ minos_voter_cfg }}'