refactor vSGW cord-3.0
Change-Id: I72a19da1803d8e9dd9d7c9e848011aa28ef4d619
diff --git a/xos/synchronizer/run.sh b/xos/synchronizer/run.sh
deleted file mode 100644
index 9d64fa9..0000000
--- a/xos/synchronizer/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Runs the XOS observer using vsgw_config
-export XOS_DIR=/opt/xos
-python vsgw-synchronizer.py -C $XOS_DIR/synchronizers/vsgw/vsgw_config
diff --git a/xos/synchronizer/steps/sync_vsgw.yaml b/xos/synchronizer/steps/sync_vsgw.yaml
deleted file mode 100644
index 997e0cb..0000000
--- a/xos/synchronizer/steps/sync_vsgw.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- hosts: {{ instance_name }}
- connection: ssh
- user: ubuntu
- become: yes
- gather_facts: no
- tasks:
-
- vars:
- - tenant_message: "{{ tenant_message }}"
-
-# - name: Write message
-# shell: echo "{{ tenant_message }}" > /var/tmp/index.html
-#
-# - name: setup s1u interface config
-# shell: ./start_3gpp_int.sh eth1 {{ s1u_sgw_tag }} {{ s1u_sgw_ip }}/24
-#
-# - name: setup s11 interface config
-# shell: ./start_3gpp_int.sh eth2 {{ s11_sgw_tag }} {{ s11_sgw_ip }}/24
-#
-# - name: setup s5s8 interface config
-# shell: ./start_3gpp_int.sh eth3 {{ s5s8_sgw_tag }} {{ s5s8_sgw_ip }}/24
-
-# roles:
-# - install_apache
-# - create_index
-
diff --git a/xos/synchronizer/steps/sync_vsgw.py b/xos/synchronizer/steps/sync_vsgwtenant.py
similarity index 82%
rename from xos/synchronizer/steps/sync_vsgw.py
rename to xos/synchronizer/steps/sync_vsgwtenant.py
index 552bdc1..4d7e3b4 100644
--- a/xos/synchronizer/steps/sync_vsgw.py
+++ b/xos/synchronizer/steps/sync_vsgwtenant.py
@@ -1,7 +1,6 @@
import os
import sys
from django.db.models import Q, F
-# from services.vsgw.models import VSGWService, VSGWTenant
from synchronizers.new_base.modelaccessor import *
from synchronizers.new_base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
@@ -16,9 +15,9 @@
requested_interval = 0
- template_name = "sync_vsgw.yaml"
+ template_name = "vsgwtenant_playbook.yaml"
- service_key_name = "/opt/xos/synchronizers/vsgw/vsgw_private_key"
+ service_key_name = "/opt/xos/configurations/mcord/mcord_private_key"
def __init__(self, *args, **kwargs):
super(SyncVSGWTenant, self).__init__(*args, **kwargs)
@@ -37,6 +36,5 @@
def get_extra_attributes(self, o):
fields = {}
fields['tenant_message'] = o.tenant_message
- fields['image_name'] = o.image_name
return fields
diff --git a/xos/synchronizer/steps/vsgwtenant_playbook.yaml b/xos/synchronizer/steps/vsgwtenant_playbook.yaml
new file mode 100644
index 0000000..ede8674
--- /dev/null
+++ b/xos/synchronizer/steps/vsgwtenant_playbook.yaml
@@ -0,0 +1,11 @@
+---
+- hosts: {{ instance_name }}
+ connection: ssh
+ user: ubuntu
+ become: yes
+ gather_facts: no
+ tasks:
+
+ vars:
+ - tenant_message: "{{ tenant_message }}"
+
diff --git a/xos/synchronizer/vsgw-synchronizer.py b/xos/synchronizer/vsgw-synchronizer.py
old mode 100644
new mode 100755
diff --git a/xos/synchronizer/vsgw_config b/xos/synchronizer/vsgw_config
deleted file mode 100644
index 02d3fb0..0000000
--- a/xos/synchronizer/vsgw_config
+++ /dev/null
@@ -1,28 +0,0 @@
-# Required by XOS
-[db]
-name=xos
-user=postgres
-password=password
-host=xos_db
-port=5432
-
-# Required by XOS
-[api]
-nova_enabled=True
-
-# Sets options for the synchronizer
-[observer]
-name=vsgw
-dependency_graph=/opt/xos/synchronizers/vsgw/model-deps
-steps_dir=/opt/xos/synchronizers/vsgw/steps
-sys_dir=/opt/xos/synchronizers/vsgw/sys
-logfile=/var/log/xos_backend.log
-pretend=False
-backoff_disabled=True
-save_ansible_output=True
-proxy_ssh=True
-proxy_ssh_key=/root/setup/id_rsa
-proxy_ssh_user=root
-enable_watchers=True
-[networking]
-use_vtn=True