Merge pull request #933 from project-sunbird/fix-tag-2.4.0

Fix tag 2.4.0 and merge to release-2.4.0

ansible/inventory/env/group_vars/all.yml

@@ -315,7 +315,7 @@ zk_port: 2181
 
 kafka_broker_host: "{{groups['kafka']|join(',')}}"
 zookeeper_quorum: "{{groups['kafka']|join(':2182,')}}:2181"
-sunbird_telemetry_kafka_topic: "{{env}}.telemetry.ingestion"
+sunbird_telemetry_kafka_topic: "{{env}}.telemetry.ingest"
 sunbird_data_pipeline_kafka_topic: "{{env}}.telemetry.ingest"
 telemetry_proxy_url: "{{sunbird_ekstep_api_base_url}}/data/v3/telemetry"
 sunbird_telemetry_request_max_count: 100
@@ -564,7 +564,6 @@ player_limit_memory: 512M
 content_replicas: 1
 content_reservation_memory: 1000M
 content_limit_memory: 1000M
-learner_reservation_cpu: 1
 badger_replicas: 1
 badger_reservation_memory: 500MB
 badger_limit_memory: 500MB

ansible/keycloak.yml

@@ -29,5 +29,4 @@
     - name: After succesful migration and staring of keycloak, start back monit if installed
       service: name=monit state=started
       become: yes
-      when: ansible_facts.services.monit is defined
-
+      when: ansible_facts.services.monit is defined

ansible/postgresql-data-update-managed.yml

@@ -0,0 +1,7 @@
+- hosts: localhost
+  gather_facts: no
+  become: yes
+  vars_files:
+    - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
+  roles:
+    - postgresql-data-update-managed

ansible/postgresql-data-update.yml

@@ -1,7 +1,6 @@
-- hosts: localhost
-  gather_facts: no
+- hosts: postgresql-master
   become: yes
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
   roles:
-    - postgresql-data-update
+    - postgresql-data-update

ansible/roles/keycloak-deploy/tasks/main.yml

@@ -1,12 +1,13 @@
 ---
+- include: bootstrap.yml
+  tags:
+      - bootstrap
+
 - include: deploy.yml
   tags:
       - deploy
 
 - include: custom.yml
   tags:
-      - deploy
+      - custom
 
-- include: bootstrap.yml
-  tags:
-      - bootstrap