openstack/openstack-ansible
Code Issues Proposed changes

Ensure that nova and neutron provide consistent DHCP domain values

Browse Source 
This patch adds the dhcp_domain config entry to nova.conf and
implements group_vars to default both nova and neutron's dhcp
domain values to be the same.

The individual values can still be overridden in user_variables
by using nova_dhcp_domain or neutron_dhcp_domain, but it's expected
that deployers would like these to be consistent.

Change-Id: I97beb78f62aeca2665ff72805056d36ead2adaaa
Closes-Bug: #1482045
This commit is contained in:
Jesse Pretorius 2015-08-14 13:38:21 +01:00
parent c8b133e025
commit 7427775201
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/openstack_deploy/user_variables.yml
View File

@ -58,6 +58,9 @@ glance_swift_store_endpoint_type: internalURL
# nova_cpu_allocation_ratio: 2.0
# nova_ram_allocation_ratio: 1.0
# If you wish to change the dhcp_domain configured for both nova and neutron
# dhcp_domain:
## Glance with Swift
### Extra options when configuring swift as a glance back-end.
### By default it will use the local swift install

5
playbooks/inventory/group_vars/hosts.yml
View File

@ -69,6 +69,8 @@ memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansi
## Region Name
service_region: RegionOne
## DHCP Domain Name
dhcp_domain: openstacklocal
## OpenStack global Endpoint Protos
#openstack_service_publicuri_proto: http
@ -85,6 +87,7 @@ ceilometer_service_adminuri: "{{ ceilometer_service_proto }}://{{ internal_lb_vi
ceilometer_service_adminurl: "{{ ceilometer_service_adminuri }}/"
ceilometer_service_region: "{{ service_region }}"
## Nova
nova_service_port: 8774
nova_service_proto: http
@ -100,6 +103,7 @@ nova_metadata_port: 8775
nova_keystone_auth_plugin: password
nova_ceph_client: '{{ cinder_ceph_client }}'
nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
nova_dhcp_domain: "{{ dhcp_domain }}"
## Neutron
@ -119,6 +123,7 @@ neutron_service_l3_program_enabled: true
neutron_service_linuxbridge_program_enabled: true
neutron_service_metadata_program_enabled: true
neutron_service_metering_program_enabled: true
neutron_dhcp_domain: "{{ dhcp_domain }}"
## Glance

3
playbooks/roles/os_nova/defaults/main.yml
View File

@ -204,6 +204,7 @@ nova_max_age: 0
nova_remove_unused_resized_minimum_age_seconds: 3600
nova_image_cache_manager_interval: 0
nova_resume_guests_state_on_host_boot: False
nova_dhcp_domain: novalocal
# Nova quota
nova_quota_cores: 20
@ -253,7 +254,7 @@ nova_ceph_client_uuid: 517a4663-3927-44bc-9ea7-4a90e1cd4c66
nova_libvirt_disk_cachemodes: '{{ nova_libvirt_images_rbd_pool is defined | ternary("network=writeback", "") }}'
nova_libvirt_hw_disk_discard: '{{ nova_libvirt_images_rbd_pool is defined | ternary("unmap", "ignore") }}'
## General Neutron configuration
## General Nova configuration
# If ``nova_osapi_compute_workers`` is unset the system will use half the number of available VCPUS to
# compute the number of api workers to use.
# nova_osapi_compute_workers: 16

1
playbooks/roles/os_nova/templates/nova.conf.j2
View File

@ -83,6 +83,7 @@ metadata_port = {{ nova_metadata_port }}
metadata_workers = {{ nova_metadata_workers | default(api_threads) }}
# Network
dhcp_domain = {{ nova_dhcp_domain }}
force_dhcp_release = True
dhcpbridge_flagfile = /etc/nova/nova.conf
firewall_driver = {{ nova_firewall_driver }}