diff --git a/ansible/inventories/sample/group_vars/sample b/ansible/inventories/sample/group_vars/sample index 0d01d6bac213efc7e881d516f047fef7249111a7..edb1c01880b362c16d8b9f1ce0927cda334d4e62 100644 --- a/ansible/inventories/sample/group_vars/sample +++ b/ansible/inventories/sample/group_vars/sample @@ -44,7 +44,7 @@ sunbird_mail_server_password: #SMTP server pasword. Could be ignored if not ma sunbird_mail_server_from_email: #Email ID that should be as from address in mails #player_tenant_dir: #Configure if customising the image, path in which volume should be mounted. sunbird_background_actor_host: -sunbird_actor_system_name: +sunbird_actor_system_name: ## Keycloak (auth server) login details @@ -100,7 +100,6 @@ sunbird_cassandra_urls: "{{ cassandra_server_private_ip }}:{{ cassandra_port }}" sunbird_session_store_type: cassandra sunbird_portal_title_name: sunbird_keycloak_client_id: -keycloak_admin_username: keycloak_admin_initial_password: project: sunbird diff --git a/ansible/roles/elasticsearch_old/tasks/main.yml b/ansible/roles/elasticsearch_old/tasks/main.yml index 3e3b9179d9cfafd7773e6ed712c8c5a860f92a63..aebe1704ff65a8f1c0fd5e535e20a3730a0bd99b 100644 --- a/ansible/roles/elasticsearch_old/tasks/main.yml +++ b/ansible/roles/elasticsearch_old/tasks/main.yml @@ -28,7 +28,7 @@ - name: Copy logger file template: src=logging.yml dest={{ elasticsearch_config }}/logging.yml - sudo: yes + become: yes tags: update_es_config notify: Restart elasticsearch @@ -61,7 +61,7 @@ - { line: 'elasticsearch - nofile {{ es_default_max_open_files }}' } - { line: 'elasticsearch - memlock unlimited' } - { line: 'root - memlock unlimited' } - sudo: yes + become: yes notify: Restart elasticsearch - name: Start Elasticsearch diff --git a/ansible/roles/git/tasks/main.yml b/ansible/roles/git/tasks/main.yml index 7e0166ab28218dc2567c99c6908eb109fc800843..b5cd5289f2c2d7699185c616732be2a4f3efd967 100755 --- a/ansible/roles/git/tasks/main.yml +++ b/ansible/roles/git/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: setup-RedHat.yml - when: ansible_os_family == 'RedHat' +- include: setup-Debian.yml + when: ansible_os_family == 'Debian' - include: setup-Alpine.yml when: ansible_os_family == 'Alpine' \ No newline at end of file diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index cc70d2128d3980cc768ea1ba3cb427ed96284cfb..891411b93bb0eed2d93b6c18218fc3a5d4eaad83 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -1947,7 +1947,7 @@ kong_apis: config.hour: '{{ medium_rate_limit_per_hour }}' config.limit_by: credential - name: request-size-limiting - config.allowed_payload_size: '{{ small_request_size_limit }}' + config.allowed_payload_size: '{{ small_request_size_limit }}' - name: updateUserTcStatus request_path: '{{ user_service_prefix }}/v1/tc/update' upstream_url: '{{ learning_service_url }}/v1/user/tc/update' @@ -1962,7 +1962,7 @@ kong_apis: config.hour: '{{ medium_rate_limit_per_hour }}' config.limit_by: credential - name: request-size-limiting - config.allowed_payload_size: '{{ small_request_size_limit }}' + config.allowed_payload_size: '{{ small_request_size_limit }}' - name: createLocation request_path: '{{ org_service_prefix }}/v1/location/create' upstream_url: '{{ learning_service_url }}/v1/location/create' @@ -1992,7 +1992,7 @@ kong_apis: config.hour: '{{ medium_rate_limit_per_hour }}' config.limit_by: credential - name: request-size-limiting - config.allowed_payload_size: '{{ small_request_size_limit }}' + config.allowed_payload_size: '{{ small_request_size_limit }}' - name: deleteLocation request_path: '{{ org_service_prefix }}/v1/location/delete' upstream_url: '{{ learning_service_url }}/v1/location/delete' @@ -2007,7 +2007,7 @@ kong_apis: config.hour: '{{ medium_rate_limit_per_hour }}' config.limit_by: credential - name: request-size-limiting - config.allowed_payload_size: '{{ small_request_size_limit }}' + config.allowed_payload_size: '{{ small_request_size_limit }}' - name: updateLocation request_path: '{{ org_service_prefix }}/v1/location/update' upstream_url: '{{ learning_service_url }}/v1/location/update' @@ -2022,7 +2022,7 @@ kong_apis: config.hour: '{{ medium_rate_limit_per_hour }}' config.limit_by: credential - name: request-size-limiting - config.allowed_payload_size: '{{ small_request_size_limit }}' + config.allowed_payload_size: '{{ small_request_size_limit }}' - name: profileVisibility request_path: '{{ user_service_prefix }}/v1/profile/visibility' upstream_url: '{{ learning_service_url }}/v1/user/profile/visibility' @@ -2052,7 +2052,7 @@ kong_apis: config.hour: '{{ medium_rate_limit_per_hour }}' config.limit_by: credential - name: request-size-limiting - config.allowed_payload_size: '{{ small_request_size_limit }}' + config.allowed_payload_size: '{{ small_request_size_limit }}' - name: announcementResend request_path: '{{ announcement_service_prefix }}/v1/resend' upstream_url: '{{ player_service_url }}/announcement/v1/resend' @@ -2097,4 +2097,4 @@ kong_apis: config.hour: '{{ medium_rate_limit_per_hour }}' config.limit_by: credential - name: request-size-limiting - config.allowed_payload_size: '{{ small_request_size_limit }}' + config.allowed_payload_size: '{{ small_request_size_limit }}' diff --git a/ansible/roles/nodejs/tasks/main.yml b/ansible/roles/nodejs/tasks/main.yml index 7e0166ab28218dc2567c99c6908eb109fc800843..b5cd5289f2c2d7699185c616732be2a4f3efd967 100755 --- a/ansible/roles/nodejs/tasks/main.yml +++ b/ansible/roles/nodejs/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: setup-RedHat.yml - when: ansible_os_family == 'RedHat' +- include: setup-Debian.yml + when: ansible_os_family == 'Debian' - include: setup-Alpine.yml when: ansible_os_family == 'Alpine' \ No newline at end of file diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml index 310205af96f4511e5a3f5eacf8da7c0a19bdf152..0a80017178bd36b77d8ed5f6dd1c3cac46afcebb 100644 --- a/ansible/roles/stack-sunbird/defaults/main.yml +++ b/ansible/roles/stack-sunbird/defaults/main.yml @@ -2,14 +2,13 @@ sunbird_encryption_key: sunbird_encryption_mode: sunbird_sso_publickey: -sunbird_env_logo_url: sunbird_learner_service_api_key: sunbird_learner_service_base_url: sunbird_keycloak_authServerUrl: -sunbird_keycloak_realm: +sunbird_keycloak_realm: sunbird_keycloak_clientId: sunbird_keycloak_public: -sunbird_cache_store: +sunbird_cache_store: sunbird_cache_ttl: actor_replicas: 1 @@ -33,9 +32,9 @@ sunbird_web_url: "https://{{ proxy_server_name }}" sunbird_env_logo_url: http://www.paramountias.com/media/images/current-affairs/diksha-portal.jpg sunbird_portal_title_name: 'portal' sunbird_keycloak_client_id: 'portal' -vault_sunbird_api_auth_token: +vault_sunbird_api_auth_token: sunbird_azure_storage_account: -sunbird_azure_storage_key: +sunbird_azure_storage_key: sunbird_container_name: sunbird_cdn_url: sunbird_dataservice_url: @@ -45,4 +44,3 @@ sunbird_actor_system_name: sunbird_fcm_account_key: sunbird_app_url: - \ No newline at end of file diff --git a/ansible/shard_test.yml b/ansible/shard_test.yml deleted file mode 100644 index 4bfc85e4f81571637a4879b0f6073f342988d1c0..0000000000000000000000000000000000000000 --- a/ansible/shard_test.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- hosts: spike-mongodb-1 - vars_files: - - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml'] - roles: - - role: shard_test - - diff --git a/test.sh b/test.sh new file mode 100755 index 0000000000000000000000000000000000000000..f510919c98ebbe911ec05b8b482cfbc9404a8fc0 --- /dev/null +++ b/test.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +cd ansible +for playbook_yaml in *.yml; do + ansible-playbook -i inventories/sample $playbook_yaml --syntax-check -e "hosts=dummy" +done \ No newline at end of file