From 903bb517056010757836c5d66e25a7203a792583 Mon Sep 17 00:00:00 2001
From: Keshav Prasad <msknext@gmail.com>
Date: Thu, 25 Jul 2019 14:45:40 +0530
Subject: [PATCH] fix: Removed unnecessary vars (#660)
---
.../ansible/inventory/dev/Core/common.yml | 26 +++--------------
.../inventory/dev/DataPipeline/common.yml | 11 ++-----
.../dev/KnowledgePlatform/common.yml | 29 ++++---------------
3 files changed, 13 insertions(+), 53 deletions(-)
diff --git a/private_repo/ansible/inventory/dev/Core/common.yml b/private_repo/ansible/inventory/dev/Core/common.yml
index 8b1e0737b..f00220af5 100644
--- a/private_repo/ansible/inventory/dev/Core/common.yml
+++ b/private_repo/ansible/inventory/dev/Core/common.yml
@@ -1,5 +1,5 @@
-##########################################
-# Starting Of Core VARS
+############## Release-1.14.0 ##################
+
env: #Name of the environment, e.g. dev, staging or production.
env_name: "{{ env }}"
domain_name: #Domain on which the portal will be accessed. e.g. staging.{implementation-name}.org
@@ -8,7 +8,7 @@ bootstrap_user:
bootstrap_key_path:
ssh_public_key_deployer: "" # SSH Public key for deployer user, with which ansible will execute tasks
-ekstep_s3_env: qa # dev or qa or prod of ekstep for plugins
+ekstep_s3_env: # dev or qa or prod of ekstep for plugins
learningservice_ip: # Load balancer IP for learning server
searchservice_ip: # search service Load balancer IP
analyticsapi_ip: # Analytics Service Load Balancer IP
@@ -31,7 +31,7 @@ mail_server_host:
mail_server_username: ""
alerts_mailing_list : "" # Comma separated mail list for Alerts; eg: user1@mail.com, user2@mail.com
sunbird_mail_server_from_email: # Email ID that should be as from address in mails
-sunbird_env_logo_url # put public url for logo, this logo url will be used in email sending.
+sunbird_env_logo_url: # put public url for logo, this logo url will be used in email sending.
# Kibana oauth authorized domains; for accessing kibana dashboard
kibana_oauth_authenticated_email_domains:
@@ -51,24 +51,6 @@ sunbird_installation_email: "admin@sunbird.org" # fallback email for badger badg
upstream_url: "{{azure_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}" # Proxy url to get /assets/public
-####################### Please Check me #############################
-## Not used
-project: "sunbird"
-
-
-################################################
-
-# Keycloak values can be merged to keycloak role, once PR is merged
-keycloak_build_src: "keycloak_build"
-keycloak_ver: "keycloak-3.2.0.Final"
-keycloak_sms_provider_build: "keycloak-email-phone-autthenticator-1.0-SNAPSHOT.jar"
-keycloak_sms_provider_templates_src: "templates.tar.gz"
-keycloak_sms_provider_templates_dest: "/opt/keycloak/themes/sunbird/login"
-keycloak_ekstep_sunbird_login_theme_file: "login.tar.gz"
-keycloak_ekstep_sunbird_login_theme_dest: "/opt/keycloak/themes/sunbird/login"
-keycloak_postgresql: "postgresql-9.4.1212.jar"
-sunbird_auth_version: 1.0v
-
############## Release-1.15.0 & 2.0.0 ##################
#sunbird_cassandra_replication_strategy: '{"class":"NetworkTopologyStrategy","datacenter1":2}' # If using cluster give this value and choose datacenter and replication factor as required '{"class":"NetworkTopologyStrategy","datacenter1":2}' if not using cluster, leave this variable commented
diff --git a/private_repo/ansible/inventory/dev/DataPipeline/common.yml b/private_repo/ansible/inventory/dev/DataPipeline/common.yml
index 5247020fd..2c5471499 100644
--- a/private_repo/ansible/inventory/dev/DataPipeline/common.yml
+++ b/private_repo/ansible/inventory/dev/DataPipeline/common.yml
@@ -1,6 +1,5 @@
-############## Common ######################
+###### Release 1.14.0 and 2.0.0 #######
-# Common vars for env
env:
proto:
domain_name:
@@ -8,9 +7,6 @@ ssh_public_key_deployer:
bootstrap_user:
bootstrap_key_path:
-#################### DP ##########################
-
-# Is it same as `channel_data_exhaust_bucket`
secor_azure_container_name: ""
secor_alerts_slack_channel: ""
@@ -18,10 +14,9 @@ dp_azure_account_name: # azure storage account name
default_org_hash_id: "" # channel id of the organization
# Data products monitoring web hooks
-data_exhaust_webhook_url: "" ####Slack webhook
-data_exhaust_Channel: "" ### salck channel for data products alerts
+data_exhaust_webhook_url: "" ## Slack webhook
+data_exhaust_Channel: "" ## salck channel for data products alerts
data_exhaust_name:
-bucket: #### same as secor_azure_container_name
stream_base_url: ""
# Media content
diff --git a/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml b/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
index a4f306758..bb15711bd 100644
--- a/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
+++ b/private_repo/ansible/inventory/dev/KnowledgePlatform/common.yml
@@ -1,9 +1,4 @@
-### !!! Remove this from public template !!!
-### !!! These are private values only for sunbird/ntp !!!
-instance_name: sunbird
-instance: dev
-
-############## Common ######################
+###### Release 1.14.0, 2.0.0 ########
env:
proto:
@@ -14,29 +9,17 @@ ekstep_domain_name:
ssh_public_key_deployer:
bootstrap_user:
bootstrap_key_path:
-###################### LP ############################
azure_public_container:
azure_account_name:
-
-
-# This variable should change value per env
-# eg:
-# environment_id: "10000000" # for dev
-# environment_id: "20000000" # for staging env
-
-environment_id:
-
-########### jenkinspipeline upload artifact ############
-artifacts_container:
-
-
+environment_id: # Should be a number of 8 digit like 1000000. This should be unique per environment
neo4j_zip: neo4j-enterprise-3.3.9-unix.tar.gz # neo4j enterprise version.zip present in the artifacts folder
neo4j_home: "{{learner_user_home}}/{{neo4j_dir}}/neo4j-enterprise-3.3.9" # Change this path to the version of neo4j you will be using
neo4j_enterprise: "true"
+########### Jenkinspipeline upload artifact ############
+artifacts_container:
+
## backup
-backup_azure_storage_account_name: sunbirdbackupsdev
-### overriding backup secret
+backup_azure_storage_account_name:
backup_azure_storage_access_key: "{{lp_vault_azure_storage_secret}}"
-
--
GitLab