Refactor to match syncrhonizer changes
diff --git a/xos/configurations/devel/docker-compose.yml b/xos/configurations/devel/docker-compose.yml
index b592bce..fa3baa8 100644
--- a/xos/configurations/devel/docker-compose.yml
+++ b/xos/configurations/devel/docker-compose.yml
@@ -18,7 +18,7 @@
xos_synchronizer_vpn:
image: xosproject/xos-synchronizer-openstack
- command: bash -c "sleep 120 ; python /opt/xos/observers/vpn/vpn-observer.py -C /opt/xos/observers/vpn/vpn_config"
+ command: bash -c "sleep 120 ; python /opt/xos/synchronizers/vpn/vpn-synchronizer.py -C /opt/xos/synchronizers/vpn/vpn_config"
labels:
org.xosproject.kind: synchronizer
org.xosproject.target: vpn
@@ -27,7 +27,7 @@
extra_hosts:
- ctl:${MYIP}
volumes:
- - ../setup/id_rsa:/opt/xos/observers/vpn/vpn_private_key:ro # private key
+ - ../setup/id_rsa:/opt/xos/synchronizers/vpn/vpn_private_key:ro # private key
# FUTURE
#xos_swarm_synchronizer:
diff --git a/xos/synchronizers/vpn/run.sh b/xos/synchronizers/vpn/run.sh
index 1bf07bc..9a2e69b 100755
--- a/xos/synchronizers/vpn/run.sh
+++ b/xos/synchronizers/vpn/run.sh
@@ -1,2 +1,2 @@
export XOS_DIR=/opt/xos
-python vpn-synchronizer.py -C $XOS_DIR/synchronizer/vpn/vpn_config
+python vpn-synchronizer.py -C $XOS_DIR/synchronizers/vpn/vpn_config
diff --git a/xos/synchronizers/vpn/steps/sync_vpntenant.py b/xos/synchronizers/vpn/steps/sync_vpntenant.py
index a966dd8..e6dbcf7 100644
--- a/xos/synchronizers/vpn/steps/sync_vpntenant.py
+++ b/xos/synchronizers/vpn/steps/sync_vpntenant.py
@@ -13,7 +13,7 @@
observes = VPNTenant
requested_interval = 0
template_name = "sync_vpntenant.yaml"
- service_key_name = "/opt/xos/synchronizer/vpn/vpn_private_key"
+ service_key_name = "/opt/xos/synchronizers/vpn/vpn_private_key"
def __init__(self, *args, **kwargs):
super(SyncVPNTenant, self).__init__(*args, **kwargs)
diff --git a/xos/synchronizers/vpn/vpn-synchronizer.py b/xos/synchronizers/vpn/vpn-synchronizer.py
index db5b759..3227ed9 100755
--- a/xos/synchronizers/vpn/vpn-synchronizer.py
+++ b/xos/synchronizers/vpn/vpn-synchronizer.py
@@ -4,7 +4,7 @@
import os
import sys
observer_path = os.path.join(os.path.dirname(
- os.path.realpath(__file__)), "../..")
+ os.path.realpath(__file__)), "../../synchronizers/base")
sys.path.append(observer_path)
mod = importlib.import_module("xos-synchronizer")
mod.main()
diff --git a/xos/synchronizers/vpn/vpn_config b/xos/synchronizers/vpn/vpn_config
index 7433038..2cdb192 100644
--- a/xos/synchronizers/vpn/vpn_config
+++ b/xos/synchronizers/vpn/vpn_config
@@ -13,9 +13,9 @@
# Sets options for the synchronizer
[observer]
name=vpn
-dependency_graph=/opt/xos/synchronizer/vpn/model-deps
-steps_dir=/opt/xos/synchronizer/vpn/steps
-sys_dir=/opt/xos/synchronizer/vpn/sys
+dependency_graph=/opt/xos/synchronizers/vpn/model-deps
+steps_dir=/opt/xos/synchronizers/vpn/steps
+sys_dir=/opt/xos/synchronizers/vpn/sys
logfile=/var/log/xos_backend.log
pretend=False
backoff_disabled=True