diff --git a/ansible/roles/kong-consumer/defaults/main.yml b/ansible/roles/kong-consumer/defaults/main.yml index 8932d328a441f431ce7f09434cb74d3d650a5c23..673748731c440cf4d72e0f507420520fca7a54fa 100644 --- a/ansible/roles/kong-consumer/defaults/main.yml +++ b/ansible/roles/kong-consumer/defaults/main.yml @@ -1,5 +1,5 @@ --- -kong_admin_api_url: "http://localhost:8001" +kong_admin_api_url: "http://{{kong_host}}:8001" mobile_admin_groups: - mobileAdmin diff --git a/ansible/roles/postgresql-data-update/tasks/main.yml b/ansible/roles/postgresql-data-update/tasks/main.yml index 64218d9ba7be2ababa529fdc870988e4d01e984f..f6c2162d74077294f3a8e0e0f14a1ddf76a82071 100644 --- a/ansible/roles/postgresql-data-update/tasks/main.yml +++ b/ansible/roles/postgresql-data-update/tasks/main.yml @@ -1,8 +1,9 @@ +- name: creating database + include: databases.yml + - name: Verifying db users are present else creating them include: users.yml -- name: creating database - include: databases.yml - name: Copy the templates become: yes diff --git a/ansible/roles/stack-sunbird/templates/sunbird_content_service.env b/ansible/roles/stack-sunbird/templates/sunbird_content_service.env index 52f77d4cb603dc48ae71cd3fe12ba9aed1f78f55..ae549c632f8407db985a562b5625d6cf684aee6b 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_content_service.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_content_service.env @@ -1,5 +1,3 @@ -sunbird_mongo_ip={{sunbird_mongo_ip}} -sunbird_mongo_port={{sunbird_mongo_port}} ekstep_api_base_url={{sunbird_ekstep_api_base_url}} ekstep_api_key={{sunbird_ekstep_api_key}} ekstep_proxy_base_url={{sunbird_ekstep_proxy_base_url}} @@ -10,4 +8,4 @@ sunbird_keycloak_realm={{keycloak_realm}} sunbird_keycloak_client_id={{sunbird_keycloak_client_id}} sunbird_keycloak_public={{sunbird_keycloak_public}} sunbird_cache_store={{sunbird_cache_store}} -sunbird_cache_ttl={{sunbird_cache_ttl}} \ No newline at end of file +sunbird_cache_ttl={{sunbird_cache_ttl}} diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env index 676f6e8d492582b2108622ffbb095aa90401bd4c..c4be08de53ef71edf7144b22e2733e1fca1e1ebd 100644 --- a/ansible/roles/stack-sunbird/templates/sunbird_player.env +++ b/ansible/roles/stack-sunbird/templates/sunbird_player.env @@ -5,9 +5,6 @@ sunbird_content_proxy_url=http://content_service_content_service:5000 sunbird_echo_api_url={{sunbird_echo_api_url}} sunbird_autocreate_trampoline_user=false sunbird_telemetry_packet_size=20 -sunbird_mongodb_ip={{sunbird_mongo_ip}} -sunbird_mongodb_port={{sunbird_mongo_port}} -sunbird_mongodb_ttl=1 sunbird_portal_realm={{keycloak_realm}} sunbird_portal_auth_server_url={{keycloak_auth_server_url}} sunbird_portal_auth_server_client={{sunbird_portal_auth_server_client}} diff --git a/deploy/deploy-core.sh b/deploy/deploy-core.sh index 9cb7530a79c13fcab92615525bdff4ae7c590b87..824b51086f5152cd6558d0c3faa49d4953205fec 100755 --- a/deploy/deploy-core.sh +++ b/deploy/deploy-core.sh @@ -11,11 +11,11 @@ INVENTORY_PATH=$1 ENV=sample ORG=sunbird -ACTOR_SERVICE_VERSION=0.0.1-gold -PLAYER_VERSION=0.0.6-gold -CONTENT_SERVICE_VERSION=0.0.1-gold -LEARNER_SERVICE_VERSION=0.0.1-gold -PROXY_VERSION=0.0.1-gold +ACTOR_SERVICE_VERSION=0.0.3-gold +PLAYER_VERSION=0.0.8-gold +CONTENT_SERVICE_VERSION=0.0.3-gold +LEARNER_SERVICE_VERSION=0.0.3-gold +PROXY_VERSION=0.0.3-gold # Bootstrap swarm echo "@@@@@@@@@ Bootstrap swarm" diff --git a/deploy/deploy-keycloak-vm.sh b/deploy/deploy-keycloak-vm.sh index a0ff227d6f05f12b69cf86a354e029f648093144..f3782eef086c79ebdc926a2fa5a8aa1bd8739e23 100755 --- a/deploy/deploy-keycloak-vm.sh +++ b/deploy/deploy-keycloak-vm.sh @@ -7,7 +7,7 @@ if [ "$#" -ne 1 ]; then exit 1 fi -ANSIBLE_VERSION=2.4.1.0-1ppa~xenial +ANSIBLE_VERSION=2.4.2.0-1ppa~xenial # Install Ansible apt-get -y install software-properties-common apt-add-repository -y ppa:ansible/ansible @@ -18,4 +18,4 @@ INVENTORY_PATH=$1 #Deploy keycloak echo "@@@@@@@@@ Keycloak " -ansible-playbook -i $INVENTORY_PATH ../ansible/keycloak.yml --tags deploy \ No newline at end of file +ansible-playbook -i $INVENTORY_PATH ../ansible/keycloak.yml --tags deploy diff --git a/deploy/deploy-keycloak.sh b/deploy/deploy-keycloak.sh deleted file mode 100755 index 21164f7da8813fb5d0d097cfc020ba1193e08676..0000000000000000000000000000000000000000 --- a/deploy/deploy-keycloak.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -e - -if [ "$#" -ne 1 ]; then - echo "ERROR: Illegal number of parameters" - echo "Usage: $0 <inventory-path>" - exit 1 -fi - -INVENTORY_PATH=$1 - -ORG=sunbird -KEYCLOAK_VERSION=3.2.1.Final-bronze - -# Create application network -echo "@@@@@@@@@ Keycloak deploy" -ansible-playbook -i $INVENTORY_PATH ../ansible/deploy.yml --tags "stack-keycloak1" --extra-vars "deploy_keycloak1=true hub_org=${ORG} image_name=keycloak_image image_tag=$KEYCLOAK_VERSION service_name=keycloak1" diff --git a/deploy/init-dbs.sh b/deploy/init-dbs.sh index b9e4f791de57e0e0c9a2fd2edcaf15ea088924c6..31f6257ad8602ed7eb46cb7b2881b4ad574cf48c 100755 --- a/deploy/init-dbs.sh +++ b/deploy/init-dbs.sh @@ -11,8 +11,8 @@ INVENTORY_PATH=$1 # Cassandra installation echo "@@@@@@@@@ Cassandra data" -ansible-playbook -i $INVENTORY_PATH ../ansible/cassandra-data.yml +#ansible-playbook -i $INVENTORY_PATH ../ansible/cassandra-data.yml # Postgresql installation echo "@@@@@@@@@ Postgresql data" -ansible-playbook -i $INVENTORY_PATH ../ansible/postgresql-data-update.yml \ No newline at end of file +ansible-playbook -i $INVENTORY_PATH ../ansible/postgresql-data-update.yml diff --git a/deploy/install-dbs.sh b/deploy/install-dbs.sh index 8690151415d687e2ab5c8beaf0af8b5e42524ae5..fd3cb506d73ad1dc497279a0f0d7d6ff7728dfe8 100755 --- a/deploy/install-dbs.sh +++ b/deploy/install-dbs.sh @@ -7,7 +7,7 @@ if [ "$#" -ne 1 ]; then exit 1 fi -ANSIBLE_VERSION=2.4.1.0-1ppa~xenial +ANSIBLE_VERSION=2.4.2.0-1ppa~xenial # Install Ansible apt-get -y install software-properties-common apt-add-repository -y ppa:ansible/ansible @@ -28,6 +28,3 @@ ansible-playbook -i $INVENTORY_PATH ../ansible/provision.yml --tags cassandra echo "@@@@@@@@@ Postgresql-master installation" ansible-playbook -i $INVENTORY_PATH ../ansible/provision.yml --tags postgresql-master -# Mongodb installation -echo "@@@@@@@@@ Mongodb installation" -ansible-playbook -i $INVENTORY_PATH ../ansible/provision.yml --tags "mongodb" diff --git a/deploy/install-deps.sh b/deploy/install-deps.sh index 19c38d418ab5811615613e80c618f9be0f178d0c..fdf231d102c2bc45efc73243419412c15ba48b13 100755 --- a/deploy/install-deps.sh +++ b/deploy/install-deps.sh @@ -3,7 +3,7 @@ # set -o errexit DOCKER_VERSION=17.06.2~ce-0~ubuntu -ANSIBLE_VERSION=2.4.1.0-1ppa~xenial +ANSIBLE_VERSION=2.4.2.0-1ppa~xenial SWARM_MASTER_IP=$(ip route get 8.8.8.8 | awk '{print $NF; exit}') echo "MasterIP: $SWARM_MASTER_IP" @@ -46,4 +46,4 @@ systemctl restart docker # Initialise Docker Swarm, with current machine as Master (which is active) docker swarm init --advertise-addr $SWARM_MASTER_IP -docker node ls \ No newline at end of file +docker node ls diff --git a/deploy/provision-keycloak.sh b/deploy/provision-keycloak.sh index 73a201bde04a124ed7adbc83195b38881d4f16e9..f6b8c95d6732c0525eea145e29a8fc0c9bec0a30 100755 --- a/deploy/provision-keycloak.sh +++ b/deploy/provision-keycloak.sh @@ -7,7 +7,7 @@ if [ "$#" -ne 1 ]; then exit 1 fi -ANSIBLE_VERSION=2.4.1.0-1ppa~xenial +ANSIBLE_VERSION=2.4.2.0-1ppa~xenial # Install Ansible apt-get -y install software-properties-common apt-add-repository -y ppa:ansible/ansible @@ -18,4 +18,4 @@ INVENTORY_PATH=$1 #Keycloak installation echo "@@@@@@@@@ Keycloak " -ansible-playbook -i $INVENTORY_PATH ../ansible/keycloak.yml --tags provision \ No newline at end of file +ansible-playbook -i $INVENTORY_PATH ../ansible/keycloak.yml --tags provision