CORD-714, fix database hostname
rename issues with vsg synchronizer config when using run.sh
more s/vcpe_synchronizer_config/vsg_synchronizer_config/
fix node_key path
Change-Id: Id406d2e619aa1f805cd0d4eefd5cd2dacbc1fde8
diff --git a/xos/synchronizer/manifest b/xos/synchronizer/manifest
index 3144f73..2d8e48c 100644
--- a/xos/synchronizer/manifest
+++ b/xos/synchronizer/manifest
@@ -13,7 +13,6 @@
manifest
broadbandshield.py
observer_ansible_test.py
-vcpe_synchronizer_config
start-bbs.sh
steps/sync_vcpetenant.py
steps/sync_vcpetenant_new.yaml
@@ -47,5 +46,4 @@
model-deps
supervisor/vcpe-observer.conf
run.sh
-vtn_vcpe_synchronizer_config
-vcpe_stats_notifier.py
+vsg_synchronizer_config
diff --git a/xos/synchronizer/run-vtn.sh b/xos/synchronizer/run-vtn.sh
index c4c3b00..f162eb3 100755
--- a/xos/synchronizer/run-vtn.sh
+++ b/xos/synchronizer/run-vtn.sh
@@ -3,6 +3,6 @@
#fi
export XOS_DIR=/opt/xos
-cp /root/setup/node_key $XOS_DIR/synchronizers/vcpe/node_key
-chmod 0600 $XOS_DIR/synchronizers/vcpe/node_key
-python vcpe-synchronizer.py -C $XOS_DIR/synchronizers/vcpe/vtn_vcpe_synchronizer_config
+cp /root/setup/node_key $XOS_DIR/synchronizers/vsg/node_key
+chmod 0600 $XOS_DIR/synchronizers/vsg/node_key
+python vcpe-synchronizer.py -C $XOS_DIR/synchronizers/vsg/vsg_synchronizer_config
diff --git a/xos/synchronizer/run.sh b/xos/synchronizer/run.sh
index f7c670d..3d215be 100755
--- a/xos/synchronizer/run.sh
+++ b/xos/synchronizer/run.sh
@@ -3,4 +3,4 @@
#fi
export XOS_DIR=/opt/xos
-python vcpe-synchronizer.py -C $XOS_DIR/synchronizers/vcpe/vcpe_synchronizer_config
+python vcpe-synchronizer.py -C $XOS_DIR/synchronizers/vsg/vsg_synchronizer_config
diff --git a/xos/synchronizer/start.sh b/xos/synchronizer/start.sh
index dc5619b..223af53 100755
--- a/xos/synchronizer/start.sh
+++ b/xos/synchronizer/start.sh
@@ -3,4 +3,4 @@
#fi
export XOS_DIR=/opt/xos
-nohup python vcpe-synchronizer.py -C $XOS_DIR/synchronizers/vcpe/vcpe_synchronizer_config > /dev/null 2>&1 &
+nohup python vcpe-synchronizer.py -C $XOS_DIR/synchronizers/vsg/vsg_synchronizer_config > /dev/null 2>&1 &
diff --git a/xos/synchronizer/supervisor/vcpe-observer.conf b/xos/synchronizer/supervisor/vcpe-observer.conf
index 2d90293..8e9829d 100644
--- a/xos/synchronizer/supervisor/vcpe-observer.conf
+++ b/xos/synchronizer/supervisor/vcpe-observer.conf
@@ -1,2 +1,2 @@
[program:vcpe-observer]
-command=python /opt/xos/synchronizers/vsg/vcpe-synchronizer.py -C /opt/xos/synchronizers/vsg/vcpe_synchronizer_config
+command=python /opt/xos/synchronizers/vsg/vcpe-synchronizer.py -C /opt/xos/synchronizers/vsg/vsg_synchronizer_config
diff --git a/xos/synchronizer/vcpe_synchronizer_config b/xos/synchronizer/vsg_synchronizer_config
similarity index 94%
rename from xos/synchronizer/vcpe_synchronizer_config
rename to xos/synchronizer/vsg_synchronizer_config
index babe94f..fd254a2 100644
--- a/xos/synchronizer/vcpe_synchronizer_config
+++ b/xos/synchronizer/vsg_synchronizer_config
@@ -36,7 +36,7 @@
# set proxy_ssh to false on cloudlab
full_setup=True
proxy_ssh=True
-proxy_ssh_key=/root/setup/node_key
+proxy_ssh_key=/opt/cord_profile/node_key
proxy_ssh_user=root
enable_watchers=True
diff --git a/xos/synchronizer/vtn_vcpe_synchronizer_config b/xos/synchronizer/vtn_vcpe_synchronizer_config
deleted file mode 100644
index b43d831..0000000
--- a/xos/synchronizer/vtn_vcpe_synchronizer_config
+++ /dev/null
@@ -1,47 +0,0 @@
-
-[plc]
-name=plc
-deployment=VICCI
-
-[db]
-name=xos
-user=postgres
-password=password
-host=localhost
-port=5432
-
-[api]
-host=128.112.171.237
-port=8000
-ssl_key=None
-ssl_cert=None
-ca_ssl_cert=None
-ratelimit_enabled=0
-omf_enabled=0
-mail_support_address=support@localhost
-nova_enabled=True
-
-[observer]
-name=vcpe
-dependency_graph=/opt/xos/synchronizers/vsg/model-deps
-steps_dir=/opt/xos/synchronizers/vsg/steps
-sys_dir=/opt/xos/synchronizers/vsg/sys
-deleters_dir=/opt/xos/synchronizers/vsg/deleters
-log_file=console
-#/var/log/hpc.log
-driver=None
-pretend=False
-backoff_disabled=True
-save_ansible_output=True
-# set proxy_ssh to false on cloudlab
-full_setup=True
-proxy_ssh=True
-proxy_ssh_key=/opt/xos/synchronizers/vsg/node_key
-proxy_ssh_user=root
-
-[networking]
-use_vtn=True
-
-[feefie]
-client_id='vicci_dev_central'
-user_id='pl'