diff --git a/ansible/filter_plugins/networks.py b/ansible/filter_plugins/networks.py index b0e91f8ae..0490f0853 100644 --- a/ansible/filter_plugins/networks.py +++ b/ansible/filter_plugins/networks.py @@ -78,6 +78,16 @@ def net_allocation_pool_end(context, name, inventory_hostname=None): return net_attr(context, name, 'allocation_pool_end', inventory_hostname) +@jinja2.contextfilter +def net_neutron_allocation_pool_start(context, name, inventory_hostname=None): + return net_attr(context, name, 'neutron_allocation_pool_start', inventory_hostname) + + +@jinja2.contextfilter +def net_neutron_allocation_pool_end(context, name, inventory_hostname=None): + return net_attr(context, name, 'neutron_allocation_pool_end', inventory_hostname) + + @jinja2.contextfilter def net_vlan(context, name, inventory_hostname=None): return net_attr(context, name, 'vlan', inventory_hostname) @@ -221,6 +231,8 @@ class FilterModule(object): 'net_gateway': net_gateway, 'net_allocation_pool_start': net_allocation_pool_start, 'net_allocation_pool_end': net_allocation_pool_end, + 'net_neutron_allocation_pool_start': net_neutron_allocation_pool_start, + 'net_neutron_allocation_pool_end': net_neutron_allocation_pool_end, 'net_vlan': net_vlan, 'net_mtu': net_mtu, 'net_interface_obj': net_interface_obj, diff --git a/ansible/provision-net.yml b/ansible/provision-net.yml index 567f49d92..1565567f7 100644 --- a/ansible/provision-net.yml +++ b/ansible/provision-net.yml @@ -19,5 +19,5 @@ neutron_net_subnet_name: "{{ kolla_ironic_provisioning_network }}" neutron_net_cidr: "{{ provision_wl_net_name | net_cidr }}" neutron_net_gateway_ip: "{{ provision_wl_net_name | net_gateway }}" - neutron_net_allocation_pool_start: "{{ provision_wl_net_name | net_allocation_pool_start }}" - neutron_net_allocation_pool_end: "{{ provision_wl_net_name | net_allocation_pool_end }}" + neutron_net_allocation_pool_start: "{{ provision_wl_net_name | net_neutron_allocation_pool_start }}" + neutron_net_allocation_pool_end: "{{ provision_wl_net_name | net_neutron_allocation_pool_end }}" diff --git a/etc/kayobe/networks.yml b/etc/kayobe/networks.yml index 458696af6..0c9469725 100644 --- a/etc/kayobe/networks.yml +++ b/etc/kayobe/networks.yml @@ -44,6 +44,8 @@ # provision_wl_net_cidr: # provision_wl_net_allocation_pool_start: # provision_wl_net_allocation_pool_end: +# provision_wl_net_neutron_allocation_pool_start: +# provision_wl_net_neutron_allocation_pool_end: # provision_wl_net_gateway: # provision_wl_net_vlan: # provision_wl_net_mtu: @@ -64,6 +66,8 @@ # external_net_cidr: # external_net_allocation_pool_start: # external_net_allocation_pool_end: +# external_net_neutron_allocation_pool_start: +# external_net_neutron_allocation_pool_end: # external_net_gateway: # external_net_vlan: # external_net_mtu: