summaryrefslogtreecommitdiffstats
path: root/snaps/openstack/create_instance.py
diff options
context:
space:
mode:
authorSteven Pisarski <s.pisarski@cablelabs.com>2017-07-18 13:48:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-18 13:48:52 +0000
commitacda399def76b37345f298c7df14ae2594cdc147 (patch)
tree61cf4d96349f800aa807898523b6a9346ef585d2 /snaps/openstack/create_instance.py
parentf2fc55fc622b57c078615d847443023fea0799e2 (diff)
parent34623d35ba81b5d8290b87e469af784be746f78f (diff)
Merge "Added proper assertion config NIC test."
Diffstat (limited to 'snaps/openstack/create_instance.py')
-rw-r--r--snaps/openstack/create_instance.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/snaps/openstack/create_instance.py b/snaps/openstack/create_instance.py
index 189ea57..97f04f3 100644
--- a/snaps/openstack/create_instance.py
+++ b/snaps/openstack/create_instance.py
@@ -405,7 +405,7 @@ class OpenStackVmInstance:
"""
Responsible for configuring NICs on RPM systems where the instance has
more than one configured port
- :return: None
+ :return: the value returned by ansible_utils.apply_ansible_playbook()
"""
if len(self.__ports) > 1 and len(self.__floating_ips) > 0:
if self.vm_active(block=True) and self.vm_ssh_active(block=True):
@@ -413,11 +413,12 @@ class OpenStackVmInstance:
port_index = self.__ports.index((key, port))
if port_index > 0:
nic_name = 'eth' + repr(port_index)
- self.__config_nic(
+ retval = self.__config_nic(
nic_name, port,
self.__get_first_provisioning_floating_ip().ip)
logger.info('Configured NIC - %s on VM - %s',
nic_name, self.instance_settings.name)
+ return retval
def __get_first_provisioning_floating_ip(self):
"""