Skip to content

Commit

Permalink
Issue #000 feat: lms-service changes
Browse files Browse the repository at this point in the history
  • Loading branch information
G33tha committed Jun 25, 2019
1 parent 3847f57 commit d41ba92
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 18 deletions.
2 changes: 1 addition & 1 deletion ansible/roles/kong-api/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ sso_service_prefix: /sso

# Service URLs
content_service_url: "http://content-service:5000"
learning_service_url: "http://learner-service:9000"
learning_service_url: "http://lms-service:9000"
vm_learning_service_url: "http://{{learningservice_ip}}:8080/learning-service"
telemetry_service_url: "http://telemetry-service:9001"
player_service_url: "http://player_player:3000"
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/reset-docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
shell: "docker service rm actor-service"
ignore_errors: yes

- name: Remove learner service
shell: "docker service rm learner-service"
- name: Remove lms service
shell: "docker service rm lms-service"
ignore_errors: yes

- name: Remove player service
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/stack-monitor-stateful/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ service_teams:
alerts_mailing_list: "{{ app_alerts_mailing_list | default(devops_alerts_mailing_list) }}"
services:
- actor-service
- learner-service
- lms-service
- content-service
- player_player
- cassandra
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/stack-monitor/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ service_teams:
alerts_mailing_list: "{{ app_alerts_mailing_list | default(devops_alerts_mailing_list) }}"
services:
- actor-service
- learner-service
- lms-service
- content-service
- player_player
- cassandra
Expand Down
9 changes: 0 additions & 9 deletions ansible/roles/stack-sunbird/tasks/learner_service.yml

This file was deleted.

2 changes: 1 addition & 1 deletion ansible/roles/stack-sunbird/tasks/lms_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
ignore_errors: yes

- name: Deploy lms service
shell: "docker service create --with-registry-auth --replicas {{ learner_replicas }} -p 9000:9000 --name lms-service --hostname lms-service --reserve-memory {{ learner_reservation_memory }} --limit-memory {{ learner_limit_memory }} --limit-cpu {{ learner_limit_cpu }} --reserve-cpu {{ learner_reservation_cpu }} --health-cmd 'wget -qO- lms-service:9000/service/health || exit 1' --health-timeout 3s --health-retries 3 --network application_default --env-file /home/deployer/env/sunbird_learner-service.env {{hub_org}}/{{image_name}}:{{image_tag}}"
shell: "docker service create --with-registry-auth --replicas {{ learner_replicas }} -p 9000:9000 --name lms-service --hostname lms-service --reserve-memory {{ learner_reservation_memory }} --limit-memory {{ learner_limit_memory }} --limit-cpu {{ learner_limit_cpu }} --reserve-cpu {{ learner_reservation_cpu }} --health-cmd 'wget -qO- lms-service:9000/service/health || exit 1' --health-timeout 3s --health-retries 3 --network application_default --env-file /home/deployer/env/sunbird_lms-service.env {{hub_org}}/{{image_name}}:{{image_tag}}"
args:
chdir: /home/deployer/stack
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ sunbird_cassandra_port=9042
sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
{% endif %}

sunbird_mw_system_host=learner-service
sunbird_mw_system_host=lms-service
sunbird_mw_system_port=8088
background_actor_provider=local
api_actor_provider=local
Expand All @@ -57,7 +57,7 @@ sunbird_remote_bg_req_router_path=akka.tcp://SunbirdMWSystem@actor-service:8088/
sunbird_api_base_url=http://content-service:5000
sunbird_authorization={{sunbird_api_auth_token}}
telemetry_pdata_id={{sunbird_telemetry_pdata_id}}
telemetry_pdata_pid=learner-service
telemetry_pdata_pid=lms-service
sunbird_telemetry_base_url=http://telemetry-service:9001
telemetry_queue_threshold_value=100
sunbird_default_channel={{sunbird_default_channel}}
Expand Down
2 changes: 1 addition & 1 deletion ansible/static-files/health.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#apk add jq
outpt1=$(curl -s content-service:5000/health | jq '.result.healthy')
outpt2=$(curl -s player_player:3000/health| jq '.result.healthy')
outpt3=$(curl -s learner-service:9000/health | jq '.result.response.checks[0].healthy')
outpt3=$(curl -s lms-service:9000/health | jq '.result.response.checks[0].healthy')
echo ""
echo ""
if [ "$outpt1" == "true" ];then
Expand Down

0 comments on commit d41ba92

Please sign in to comment.