commit 6b01723b97bb1e75ea93cdafa00a590123c2ed6d
author Omar Abdelkader <omikader@gmail.com> Mon Aug 07 19:48:57 2017 -0600
committer Omar Abdelkader <omikader@gmail.com> Tue Aug 08 18:59:49 2017 -0600
tree d97ebeac529985b4bf10b31ee117bf8bbd58a7ee
parent 6e3df1dfcc5a1ff77f3ead40258867d28dc2b4fd

refactor vSGW cord-3.0

Change-Id: I72a19da1803d8e9dd9d7c9e848011aa28ef4d619

xos/synchronizer/steps/sync_vsgw.yaml

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
-

xos/synchronizer/steps/sync_vsgwtenant.py

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
 

xos/synchronizer/steps/vsgwtenant_playbook.yaml

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 }}"
+