From d8a069580df88e4a304795591342193948205ecc Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Gangula Date: Mon, 11 Jan 2021 15:44:00 +0530 Subject: [PATCH] Issue #000 fix: remove script store configurations. --- ansible/inventory/env/group_vars/all.yml | 1 - .../cassandra-db-update/templates/data.cql.j2 | 17 ----------------- .../templates/application.conf.j2 | 2 -- .../src/test/resources/application.conf | 2 -- .../service/src/main/resources/application.conf | 2 -- 5 files changed, 24 deletions(-) diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml index f08cd4638d..22a49038fa 100644 --- a/ansible/inventory/env/group_vars/all.yml +++ b/ansible/inventory/env/group_vars/all.yml @@ -18,7 +18,6 @@ learner_user_home: "/home/{{ learner_user }}" # these variables can be defined as {{instance}}_* content_keyspace_name: "{{instance}}_content_store" hierarchy_keyspace_name: "{{instance}}_hierarchy_store" -orchestrator_keyspace_name: "{{instance}}_script_store" dialcode_keyspace_name: "{{instance}}_dialcode_store" category_keyspace_name: "{{instance}}_category_store" assessment_keyspace_name: "{{instance}}_question_store" diff --git a/ansible/roles/cassandra-db-update/templates/data.cql.j2 b/ansible/roles/cassandra-db-update/templates/data.cql.j2 index 22d799af0b..ea78687892 100644 --- a/ansible/roles/cassandra-db-update/templates/data.cql.j2 +++ b/ansible/roles/cassandra-db-update/templates/data.cql.j2 @@ -13,18 +13,6 @@ CREATE TABLE IF NOT EXISTS {{ content_keyspace_name }}.content_data ( PRIMARY KEY (content_id) ); -CREATE KEYSPACE IF NOT EXISTS {{ orchestrator_keyspace_name }} WITH replication = { - 'class': 'SimpleStrategy', - 'replication_factor': '1' -}; - -CREATE TABLE IF NOT EXISTS {{ orchestrator_keyspace_name }}.script_data ( - name text, - type text, - reqmap text, - PRIMARY KEY (name) -); - CREATE TABLE IF NOT EXISTS {{ content_keyspace_name }}.question_data ( question_id text, last_updated_on timestamp, @@ -65,11 +53,6 @@ ALTER KEYSPACE {{ hierarchy_keyspace_name }} WITH replication = { 'datacenter1' : 2 }; -ALTER KEYSPACE {{ orchestrator_keyspace_name }} WITH replication = { - 'class': 'NetworkTopologyStrategy', - 'datacenter1' : 2 -}; - ALTER TABLE {{ content_keyspace_name }}.content_data ADD (externallink text); {% endif %} diff --git a/ansible/roles/learning-service/templates/application.conf.j2 b/ansible/roles/learning-service/templates/application.conf.j2 index 52dcda1ffa..7aa0a428b6 100644 --- a/ansible/roles/learning-service/templates/application.conf.j2 +++ b/ansible/roles/learning-service/templates/application.conf.j2 @@ -14,8 +14,6 @@ redis.port={{ redis_port }} redis.maxConnections=128 # Cassandra Configuration -orchestrator.keyspace.name="{{ orchestrator_keyspace_name }}" -orchestrator.keyspace.table="script_data" content.keyspace.name="{{ content_keyspace_name }}" hierarchy.keyspace.name="{{ hierarchy_keyspace_name }}" content.hierarchy.table="content_hierarchy" diff --git a/platform-core/unit-tests/src/test/resources/application.conf b/platform-core/unit-tests/src/test/resources/application.conf index e3f166efa4..169b02f75e 100644 --- a/platform-core/unit-tests/src/test/resources/application.conf +++ b/platform-core/unit-tests/src/test/resources/application.conf @@ -21,8 +21,6 @@ content.metadata.visibility.parent=["textbookunit", "courseunit", "lessonplanuni # Cassandra Configuration content.keyspace.name=content_store_test -orchestrator.keyspace.name="script_store" -orchestrator.keyspace.table="script_data" hierarchy.keyspace.name=hierarchy_store_test content.hierarchy.table=content_hierarchy_test framework.hierarchy.table=framework_hierarchy_test diff --git a/platform-modules/service/src/main/resources/application.conf b/platform-modules/service/src/main/resources/application.conf index 76bad61057..065c2c1c92 100644 --- a/platform-modules/service/src/main/resources/application.conf +++ b/platform-modules/service/src/main/resources/application.conf @@ -21,8 +21,6 @@ content.metadata.visibility.parent=["textbookunit", "courseunit", "lessonplanuni # Cassandra Configuration content.keyspace.name=content_store -orchestrator.keyspace.name=script_store -orchestrator.keyspace.table=script_data cassandra.lp.connection="127.0.0.1:9042,127.0.0.2:9042,127.0.0.3:9042" cassandra.lpa.connection="127.0.0.1:9042,127.0.0.2:9042,127.0.0.3:9042"