From 619ad3ebc83811af640d4f6d4294b428946d4bd1 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 17 Nov 2017 10:35:01 +0000 Subject: [PATCH] Update external-net.yml to use the stackhpc.os-networks role --- ansible/external-net.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ansible/external-net.yml b/ansible/external-net.yml index 810c17312..1cf16b274 100644 --- a/ansible/external-net.yml +++ b/ansible/external-net.yml @@ -3,20 +3,20 @@ # Only required to run on a single host. hosts: controllers[0] roles: - - role: neutron-net - neutron_net_venv: "{{ virtualenv_path }}/shade" - neutron_net_openstack_auth_type: "{{ openstack_auth_type }}" - neutron_net_openstack_auth: "{{ openstack_auth }}" + - role: stackhpc.os-networks + os_networks_venv: "{{ virtualenv_path }}/shade" + os_networks_openstack_auth_type: "{{ openstack_auth_type }}" + os_networks_openstack_auth: "{{ openstack_auth }}" # Network configuration. - neutron_net_name: "{{ external_net_name }}" - neutron_net_type: "{% if external_net_name | net_vlan %}vlan{% else %}flat{% endif %}" - neutron_net_physical_network: "physnet1" - neutron_net_segmentation_id: "{{ external_net_name | net_vlan }}" - neutron_net_shared: True - neutron_net_external: True + os_networks_name: "{{ external_net_name }}" + os_networks_type: "{% if external_net_name | net_vlan %}vlan{% else %}flat{% endif %}" + os_networks_physical_network: "physnet1" + os_networks_segmentation_id: "{{ external_net_name | net_vlan }}" + os_networks_shared: True + os_networks_external: True # Subnet configuration. - neutron_net_subnet_name: "{{ external_net_name }}" - neutron_net_cidr: "{{ external_net_name | net_cidr }}" - neutron_net_gateway_ip: "{{ external_net_name | net_gateway }}" - neutron_net_allocation_pool_start: "{{ external_net_name | net_neutron_allocation_pool_start }}" - neutron_net_allocation_pool_end: "{{ external_net_name | net_neutron_allocation_pool_end }}" + os_networks_subnet_name: "{{ external_net_name }}" + os_networks_cidr: "{{ external_net_name | net_cidr }}" + os_networks_gateway_ip: "{{ external_net_name | net_gateway }}" + os_networks_allocation_pool_start: "{{ external_net_name | net_neutron_allocation_pool_start }}" + os_networks_allocation_pool_end: "{{ external_net_name | net_neutron_allocation_pool_end }}"