openstack/kayobe
Code Issues Proposed changes

Separate IP allocation pool for inspection from kayobe and neutron pools

Browse Source 
This ensures that the inspection DHCP servers do not allocate IP addresses from
the same pool as kayobe and neutron.
This commit is contained in:
Mark Goddard 2017-04-05 14:21:57 +01:00
parent cd306f4cf3
commit 3b5d71d399
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/filter_plugins/networks.py
View File

@ -78,6 +78,16 @@ def net_allocation_pool_end(context, name, inventory_hostname=None):
return net_attr(context, name, 'allocation_pool_end', inventory_hostname) return net_attr(context, name, 'allocation_pool_end', inventory_hostname)
@jinja2.contextfilter
def net_inspection_allocation_pool_start(context, name, inventory_hostname=None):
return net_attr(context, name, 'inspection_allocation_pool_start', inventory_hostname)
@jinja2.contextfilter
def net_inspection_allocation_pool_end(context, name, inventory_hostname=None):
return net_attr(context, name, 'inspection_allocation_pool_end', inventory_hostname)
@jinja2.contextfilter @jinja2.contextfilter
def net_neutron_allocation_pool_start(context, name, inventory_hostname=None): def net_neutron_allocation_pool_start(context, name, inventory_hostname=None):
return net_attr(context, name, 'neutron_allocation_pool_start', inventory_hostname) return net_attr(context, name, 'neutron_allocation_pool_start', inventory_hostname)
@ -231,6 +241,8 @@ class FilterModule(object):
'net_gateway': net_gateway, 'net_gateway': net_gateway,
'net_allocation_pool_start': net_allocation_pool_start, 'net_allocation_pool_start': net_allocation_pool_start,
'net_allocation_pool_end': net_allocation_pool_end, 'net_allocation_pool_end': net_allocation_pool_end,
'net_inspection_allocation_pool_start': net_inspection_allocation_pool_start,
'net_inspection_allocation_pool_end': net_inspection_allocation_pool_end,
'net_neutron_allocation_pool_start': net_neutron_allocation_pool_start, 'net_neutron_allocation_pool_start': net_neutron_allocation_pool_start,
'net_neutron_allocation_pool_end': net_neutron_allocation_pool_end, 'net_neutron_allocation_pool_end': net_neutron_allocation_pool_end,
'net_vlan': net_vlan, 'net_vlan': net_vlan,

4
ansible/kolla-bifrost.yml
View File

@ -36,8 +36,8 @@
kolla_bifrost_enable_pxe_drivers: false kolla_bifrost_enable_pxe_drivers: false
# Network configuration. # Network configuration.
kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_allocation_pool_start }}" kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_inspection_allocation_pool_start }}"
kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_allocation_pool_end }}" kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_inspection_allocation_pool_end }}"
kolla_bifrost_dnsmasq_router: "{{ provision_oc_net_name | net_gateway }}" kolla_bifrost_dnsmasq_router: "{{ provision_oc_net_name | net_gateway }}"
kolla_bifrost_dnsmasq_dns_servers: "{{ resolv_nameservers | default([]) }}" kolla_bifrost_dnsmasq_dns_servers: "{{ resolv_nameservers | default([]) }}"
kolla_bifrost_domain: "{{ resolv_domain | default }}" kolla_bifrost_domain: "{{ resolv_domain | default }}"

4
ansible/kolla-openstack.yml
View File

@ -72,8 +72,8 @@
kolla_inspector_ipa_kernel_upstream_url: "{{ inspector_ipa_kernel_upstream_url }}" kolla_inspector_ipa_kernel_upstream_url: "{{ inspector_ipa_kernel_upstream_url }}"
kolla_inspector_ipa_ramdisk_upstream_url: "{{ inspector_ipa_ramdisk_upstream_url }}" kolla_inspector_ipa_ramdisk_upstream_url: "{{ inspector_ipa_ramdisk_upstream_url }}"
# Ironic inspector's dnsmasq configuration. # Ironic inspector's dnsmasq configuration.
kolla_inspector_dhcp_pool_start: "{{ inspection_net_name | net_allocation_pool_start }}" kolla_inspector_dhcp_pool_start: "{{ inspection_net_name | net_inspection_allocation_pool_start }}"
kolla_inspector_dhcp_pool_end: "{{ inspection_net_name | net_allocation_pool_end }}" kolla_inspector_dhcp_pool_end: "{{ inspection_net_name | net_inspection_allocation_pool_end }}"
# Extra free-form user-provided configuration. # Extra free-form user-provided configuration.
kolla_extra_glance: "{{ kolla_extra_config.glance | default }}" kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
kolla_extra_inspector: "{{ kolla_extra_config.inspector | default }}" kolla_extra_inspector: "{{ kolla_extra_config.inspector | default }}"

4
etc/kayobe/networks.yml
View File

@ -36,6 +36,8 @@
# provision_oc_net_cidr: # provision_oc_net_cidr:
# provision_oc_net_allocation_pool_start: # provision_oc_net_allocation_pool_start:
# provision_oc_net_allocation_pool_end: # provision_oc_net_allocation_pool_end:
# provision_oc_net_inspection_allocation_pool_start:
# provision_oc_net_inspection_allocation_pool_end:
# provision_oc_net_gateway: # provision_oc_net_gateway:
# provision_oc_net_vlan: # provision_oc_net_vlan:
# provision_oc_net_mtu: # provision_oc_net_mtu:
@ -44,6 +46,8 @@
# provision_wl_net_cidr: # provision_wl_net_cidr:
# provision_wl_net_allocation_pool_start: # provision_wl_net_allocation_pool_start:
# provision_wl_net_allocation_pool_end: # provision_wl_net_allocation_pool_end:
# provision_wl_net_inspection_allocation_pool_start:
# provision_wl_net_inspection_allocation_pool_end:
# provision_wl_net_neutron_allocation_pool_start: # provision_wl_net_neutron_allocation_pool_start:
# provision_wl_net_neutron_allocation_pool_end: # provision_wl_net_neutron_allocation_pool_end:
# provision_wl_net_gateway: # provision_wl_net_gateway: