openstack
/
charm-nova-cloud-controller
Code Issues Proposed changes

Merge "config: allow to create VMs with unique names"

This commit is contained in:
Zuul 2019-12-20 16:25:14 +00:00 committed by Gerrit Code Review
parent b8a81533d1 40282e0356
commit 8f69189c0f
11 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.yaml
View File

@ -617,3 +617,13 @@ options:
.
For Windows guests is recommended to set this to configuration option to
False and for those images set the property hw_pointer_model=usbtablet
unique-server-names:
type: string
default:
description: |
Sets the scope of the check for unique instance names.
.
An empty value (the default) means that no uniqueness check is done and
duplicate names are possible. 'project': The instance name check is done
only for instances within the same project. 'global': The instance name
check is done for all instances regardless of the project.

1
hooks/nova_cc_context.py
View File

@ -404,6 +404,7 @@ class NovaConfigContext(ch_context.WorkerConfigContext):
ctxt['console_access_port'] = hookenv.config('console-access-port')
ctxt['scheduler_host_subset_size'] = hookenv.config(
'scheduler-host-subset-size')
ctxt['unique_server_names'] = hookenv.config('unique-server-names')
return ctxt

3
templates/icehouse/nova.conf
View File

@ -24,6 +24,9 @@ auth_strategy=keystone
compute_driver=libvirt.LibvirtDriver
use_ipv6 = {{ use_ipv6 }}
osapi_compute_listen = {{ bind_host }}
{% if unique_server_names -%}
osapi_compute_unique_unique_server_names = {{ unique_server_names }}
{% endif -%}
metadata_host = {{ bind_host }}
s3_listen = {{ bind_host }}
ec2_listen = {{ bind_host }}

3
templates/juno/nova.conf
View File

@ -24,6 +24,9 @@ auth_strategy=keystone
compute_driver=libvirt.LibvirtDriver
use_ipv6 = {{ use_ipv6 }}
osapi_compute_listen = {{ bind_host }}
{% if unique_server_names -%}
osapi_compute_unique_unique_server_names = {{ unique_server_names }}
{% endif -%}
metadata_host = {{ bind_host }}
s3_listen = {{ bind_host }}
ec2_listen = {{ bind_host }}

3
templates/liberty/nova.conf
View File

@ -23,6 +23,9 @@ auth_strategy=keystone
compute_driver=libvirt.LibvirtDriver
use_ipv6 = {{ use_ipv6 }}
osapi_compute_listen = {{ bind_host }}
{% if unique_server_names -%}
osapi_compute_unique_unique_server_names = {{ unique_server_names }}
{% endif -%}
metadata_host = {{ bind_host }}
s3_listen = {{ bind_host }}
ec2_listen = {{ bind_host }}

3
templates/mitaka/nova.conf
View File

@ -22,6 +22,9 @@ auth_strategy=keystone
compute_driver=libvirt.LibvirtDriver
use_ipv6 = {{ use_ipv6 }}
osapi_compute_listen = {{ bind_host }}
{% if unique_server_names -%}
osapi_compute_unique_unique_server_names = {{ unique_server_names }}
{% endif -%}
metadata_host = {{ bind_host }}
s3_listen = {{ bind_host }}
enable_new_services = {{ enable_new_services }}

3
templates/newton/nova.conf
View File

@ -22,6 +22,9 @@ auth_strategy=keystone
compute_driver=libvirt.LibvirtDriver
use_ipv6 = {{ use_ipv6 }}
osapi_compute_listen = {{ bind_host }}
{% if unique_server_names -%}
osapi_compute_unique_unique_server_names = {{ unique_server_names }}
{% endif -%}
metadata_host = {{ bind_host }}
s3_listen = {{ bind_host }}
enable_new_services = {{ enable_new_services }}

3
templates/ocata/nova.conf
View File

@ -19,6 +19,9 @@ enabled_apis=osapi_compute,metadata
compute_driver=libvirt.LibvirtDriver
use_ipv6 = {{ use_ipv6 }}
osapi_compute_listen = {{ bind_host }}
{% if unique_server_names -%}
osapi_compute_unique_unique_server_names = {{ unique_server_names }}
{% endif -%}
metadata_host = {{ bind_host }}
s3_listen = {{ bind_host }}
enable_new_services = {{ enable_new_services }}

3
templates/pike/nova.conf
View File

@ -19,6 +19,9 @@ enabled_apis=osapi_compute,metadata
compute_driver=libvirt.LibvirtDriver
use_ipv6 = {{ use_ipv6 }}
osapi_compute_listen = {{ bind_host }}
{% if unique_server_names -%}
osapi_compute_unique_unique_server_names = {{ unique_server_names }}
{% endif -%}
metadata_host = {{ bind_host }}
s3_listen = {{ bind_host }}
enable_new_services = {{ enable_new_services }}

3
templates/rocky/nova.conf
View File

@ -19,6 +19,9 @@ enabled_apis=osapi_compute,metadata
compute_driver=libvirt.LibvirtDriver
use_ipv6 = {{ use_ipv6 }}
osapi_compute_listen = {{ bind_host }}
{% if unique_server_names -%}
osapi_compute_unique_unique_server_names = {{ unique_server_names }}
{% endif -%}
metadata_host = {{ bind_host }}
s3_listen = {{ bind_host }}
enable_new_services = {{ enable_new_services }}

3
unit_tests/test_nova_cc_contexts.py
View File

@ -334,6 +334,7 @@ class NovaComputeContextTests(CharmTestCase):
mock_config_ip.side_effect = self.test_config.get
mock_unit_get.return_value = '127.0.0.1'
self.test_config.set('scheduler-default-filters', 'TestFilter')
self.test_config.set('unique-server-names', 'project')
ctxt = context.NovaConfigContext()()
self.assertEqual(ctxt['scheduler_default_filters'],
self.config('scheduler-default-filters'))
@ -379,6 +380,8 @@ class NovaComputeContextTests(CharmTestCase):
self.config('console-access-protocol'))
self.assertEqual(ctxt['console_access_port'],
self.config('console-access-port'))
self.assertEqual(ctxt['unique_server_names'],
self.config('unique-server-names'))
_pci_alias1 = {
"name": "IntelNIC",