diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-07-18 09:37:07 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-07-20 11:27:52 -0600 |
| commit | dc7c6640c95a40623603964df6fde4adcca41e5c (patch) | |
| tree | 39f7441e2ccf3345add2888dc49b3ed739d2533e /snaps/openstack/utils/nova_utils.py | |
| parent | acda399def76b37345f298c7df14ae2594cdc147 (diff) | |
Changes required for running CI tests (Pike pod).
Added support for HTTPS proxies
HTTPS OSCreds settings for both RC file and os_env.yaml
OSCreds 'cacert' T/F and cert file path support
OSCreds API version support cleanup including the addition
of heat
Added more OSCreds test validations
Disabling of InsecureRequestWarning
PEP8 line width refactoring
heat_utils_test.py fix when stack status is error
test suite for CI
removed default flavor metadata of mem_page_size: Any to None
JIRA: SNAPS-80
Change-Id: I333e83ca79d7403bf43a9b74da4c072b4da976ba
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/utils/nova_utils.py')
| -rw-r--r-- | snaps/openstack/utils/nova_utils.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/snaps/openstack/utils/nova_utils.py b/snaps/openstack/utils/nova_utils.py index fd42c5d..16b3984 100644 --- a/snaps/openstack/utils/nova_utils.py +++ b/snaps/openstack/utils/nova_utils.py @@ -91,9 +91,11 @@ def create_server(nova, neutron, glance, instance_settings, image_settings, 'key_name': keypair_name, 'security_groups': instance_settings.security_group_names, - 'userdata': instance_settings.userdata, - 'availability_zone': - instance_settings.availability_zone} + 'userdata': instance_settings.userdata} + + if instance_settings.availability_zone: + args['availability_zone'] = instance_settings.availability_zone + server = nova.servers.create(**args) return VmInst(name=server.name, inst_id=server.id, networks=server.networks) @@ -322,16 +324,17 @@ def delete_keypair(nova, key): nova.keypairs.delete(key.id) -def get_nova_availability_zones(nova): +def get_availability_zone_hosts(nova, zone_name='nova'): """ Returns the names of all nova active compute servers :param nova: the Nova client + :param zone_name: the Nova client :return: a list of compute server names """ out = list() zones = nova.availability_zones.list() for zone in zones: - if zone.zoneName == 'nova': + if zone.zoneName == zone_name and zone.hosts: for key, host in zone.hosts.items(): if host['nova-compute']['available']: out.append(zone.zoneName + ':' + key) |