Revert "Add a SVC_CLUSTER_ID param to specify cassandra keyspace"

This reverts commit 56fbe47.
Juniper · Jul 8, 2015 · 5a5c98d · 5a5c98d
1 parent 34f76f0
commit 5a5c98d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 7 deletions.
diff --git a/contrail.sh b/contrail.sh
@@ -64,8 +64,6 @@ DISCOVERY_IP=${DISCOVERY_IP:-$CFGM_IP}
 CONTROL_IP=${CONTROL_IP:-$CFGM_IP}
 CONTRAIL_DEFAULT_INSTALL=${CONTRAIL_DEFAULT_INSTALL:-True}
 
-SVC_CLUSTER_ID=${SVC_CLUSTER_ID:-SVC}
-
 RABBIT_USER=${RABBIT_USER:-guest}
 
 TARGET=${TARGET:-production}

diff --git a/contrail_config_functions b/contrail_config_functions
@@ -154,7 +154,6 @@ function replace_svc_monitor_conf()
     check_replace_value $file DEFAULTS ifmap_password 'svc_monitor'
     check_replace_value $file DEFAULTS rabbit_user $RABBIT_USER
     check_replace_value $file DEFAULTS rabbit_password $RABBIT_PASSWORD
-    check_replace_value $file DEFAULTS cluster_id $SVC_CLUSTER_ID
     check_replace_value $file SECURITY ca_certs '/etc/contrail/ssl/certs/ca.pem'
     check_replace_value $file SECURITY certfile '/etc/contrail/ssl/certs/svc_monitor.pem'
     check_replace_value $file SECURITY keyfile '/etc/contrail/ssl/private_keys/svc_monitor_key.pem'

diff --git a/contrail_config_templates.py b/contrail_config_templates.py
@@ -88,7 +88,6 @@
 disc_server_port=$__contrail_disc_server_port__
 rabbit_user=$__contrail_rabbit_user__
 rabbit_password=$__contrail_rabbit_password__
-cluster_id=$__contrail_cluster_id__
 
 [SECURITY]
 use_certs=$__contrail_use_certs__

diff --git a/samples/localrc-all b/samples/localrc-all
@@ -45,6 +45,3 @@ CASS_HEAP_NEWSIZE=100M
 
 # target of the build debug/production
 # TARGET=production
-
-# specify the keyspace used by the svc monitor
-# SVC_CLUSTER_ID=SVC