CORD-706: Make room for new Ansible-invocation interface
Change-Id: I3c8720417c675b4e1b32ff7753166a0d02787117
diff --git a/xos/synchronizer/steps/sync_container.py b/xos/synchronizer/steps/sync_container.py
index 41e1305..e884add 100644
--- a/xos/synchronizer/steps/sync_container.py
+++ b/xos/synchronizer/steps/sync_container.py
@@ -8,7 +8,7 @@
from xos.config import Config
from synchronizers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
from synchronizers.base.syncstep import SyncStep, DeferredException
-from synchronizers.base.ansible import run_template_ssh
+from synchronizers.base.ansible_helper import run_template_ssh
from core.models import Service, Slice, Instance
from xos.logger import Logger, logging
diff --git a/xos/synchronizer/steps/sync_controller_images.py b/xos/synchronizer/steps/sync_controller_images.py
index dbda082..b944dca 100644
--- a/xos/synchronizer/steps/sync_controller_images.py
+++ b/xos/synchronizer/steps/sync_controller_images.py
@@ -8,7 +8,7 @@
from core.models import Controller
from core.models import Image, ControllerImages
from xos.logger import observer_logger as logger
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
import json
class SyncControllerImages(OpenStackSyncStep):
diff --git a/xos/synchronizer/steps/sync_controller_networks.py b/xos/synchronizer/steps/sync_controller_networks.py
index 3e848b2..357b084 100644
--- a/xos/synchronizer/steps/sync_controller_networks.py
+++ b/xos/synchronizer/steps/sync_controller_networks.py
@@ -12,7 +12,7 @@
from core.models.slice import *
from core.models.instance import Instance
from xos.logger import observer_logger as logger
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
from xos.config import Config
import json
@@ -51,7 +51,7 @@
def get_segmentation_id(self, controller_network):
driver = self.driver.admin_driver(controller = controller_network.controller)
neutron_network = driver.shell.neutron.list_networks(controller_network.network_id)["networks"][0]
- if "provider:segmentation_id" in neutron_network:
+ if "provider:segmentation_id" in neutron_network:
return neutron_network["provider:segmentation_id"]
else:
return None
diff --git a/xos/synchronizer/steps/sync_controller_site_privileges.py b/xos/synchronizer/steps/sync_controller_site_privileges.py
index 04e6e3a..805f446 100644
--- a/xos/synchronizer/steps/sync_controller_site_privileges.py
+++ b/xos/synchronizer/steps/sync_controller_site_privileges.py
@@ -9,7 +9,7 @@
from core.models.user import User
from core.models.controlleruser import ControllerUser, ControllerSitePrivilege
from xos.logger import observer_logger as logger
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
import json
class SyncControllerSitePrivileges(OpenStackSyncStep):
diff --git a/xos/synchronizer/steps/sync_controller_sites.py b/xos/synchronizer/steps/sync_controller_sites.py
index 1b3c2ba..1a1ce41 100644
--- a/xos/synchronizer/steps/sync_controller_sites.py
+++ b/xos/synchronizer/steps/sync_controller_sites.py
@@ -5,7 +5,7 @@
from synchronizers.openstack.openstacksyncstep import OpenStackSyncStep
from core.models.site import *
from synchronizers.base.syncstep import *
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizer/steps/sync_controller_slice_privileges.py b/xos/synchronizer/steps/sync_controller_slice_privileges.py
index f5472ee..b7c0487 100644
--- a/xos/synchronizer/steps/sync_controller_slice_privileges.py
+++ b/xos/synchronizer/steps/sync_controller_slice_privileges.py
@@ -8,7 +8,7 @@
from core.models.slice import Controller, SlicePrivilege
from core.models.user import User
from core.models.controlleruser import ControllerUser, ControllerSlicePrivilege
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizer/steps/sync_controller_slices.py b/xos/synchronizer/steps/sync_controller_slices.py
index cac3741..2bc0555 100644
--- a/xos/synchronizer/steps/sync_controller_slices.py
+++ b/xos/synchronizer/steps/sync_controller_slices.py
@@ -7,7 +7,7 @@
from synchronizers.openstack.openstacksyncstep import OpenStackSyncStep
from synchronizers.base.syncstep import *
from core.models import *
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizer/steps/sync_controller_users.py b/xos/synchronizer/steps/sync_controller_users.py
index 74e4bdd..189703a 100644
--- a/xos/synchronizer/steps/sync_controller_users.py
+++ b/xos/synchronizer/steps/sync_controller_users.py
@@ -8,7 +8,7 @@
from core.models.site import Controller, SiteDeployment, SiteDeployment
from core.models.user import User
from core.models.controlleruser import ControllerUser
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
from xos.logger import observer_logger as logger
import json
diff --git a/xos/synchronizer/steps/sync_instances.py b/xos/synchronizer/steps/sync_instances.py
index e172602..b899552 100644
--- a/xos/synchronizer/steps/sync_instances.py
+++ b/xos/synchronizer/steps/sync_instances.py
@@ -8,7 +8,7 @@
from core.models.instance import Instance
from core.models.slice import Slice, SlicePrivilege, ControllerSlice
from core.models.network import Network, NetworkSlice, ControllerNetwork
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
from synchronizers.base.syncstep import *
from xos.logger import observer_logger as logger
diff --git a/xos/synchronizer/steps/sync_object.py b/xos/synchronizer/steps/sync_object.py
index 3a9a84f..e03bf92 100644
--- a/xos/synchronizer/steps/sync_object.py
+++ b/xos/synchronizer/steps/sync_object.py
@@ -6,7 +6,7 @@
from synchronizers.openstack.openstacksyncstep import OpenStackSyncStep
from synchronizers.base.syncstep import *
from core.models import *
-from synchronizers.base.ansible import *
+from synchronizers.base.ansible_helper import *
from xos.logger import observer_logger as logger
import json