diff options
| author |   Steven Pisarski <s.pisarski@cablelabs.com> | 2018-01-23 16:18:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-23 16:18:51 +0000 |
| commit | 88e9754a4280690acf2ec5942b34336d469673ed (patch) | |
| tree | 284269828b606e36af90985f579095171cac9aea /snaps/openstack/utils | |
| parent | 7cf2a28e78404a3835bfde3516d1fb7ff93aa58d (diff) | |
| parent | 7ea11eada552627b5385a6a347f23fccee484e67 (diff) | |
Merge "Added password support for SSH and Ansible Additional protections when initializing network resources Enhanced playbook runner variable support"
Diffstat (limited to 'snaps/openstack/utils')
| -rw-r--r-- | snaps/openstack/utils/launch_utils.py | 2 | ||||
| -rw-r--r-- | snaps/openstack/utils/nova_utils.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/snaps/openstack/utils/launch_utils.py b/snaps/openstack/utils/launch_utils.py index e10cf48..05d4cb5 100644 --- a/snaps/openstack/utils/launch_utils.py +++ b/snaps/openstack/utils/launch_utils.py @@ -462,7 +462,7 @@ def __apply_ansible_playbook(ansible_config, os_creds, vm_dict, image_dict, retval = ansible_utils.apply_playbook( ansible_config['playbook_location'], floating_ips, remote_user, - private_key_filepath, + ssh_priv_key_file_path=private_key_filepath, variables=variables, proxy_setting=proxy_settings) if retval != 0: diff --git a/snaps/openstack/utils/nova_utils.py b/snaps/openstack/utils/nova_utils.py index e15484c..279e2ec 100644 --- a/snaps/openstack/utils/nova_utils.py +++ b/snaps/openstack/utils/nova_utils.py @@ -69,8 +69,11 @@ def create_server(nova, neutron, glance, instance_config, image_config, ports = list() for port_setting in instance_config.port_settings: - ports.append(neutron_utils.get_port( - neutron, port_settings=port_setting)) + port = neutron_utils.get_port(neutron, port_settings=port_setting) + if port: + ports.append(port) + else: + raise Exception('Cannot find port named - ' + port_setting.name) nics = [] for port in ports: kv = dict() |