From 929b5424107ed61650aaf9b0db51eca36677655b Mon Sep 17 00:00:00 2001
From: Egon Rijpkema <git@egonrijpkema.nl>
Date: Thu, 21 Sep 2017 16:16:36 +0200
Subject: [PATCH] Make PHYSICAL_INTERFACE_MAPPINGS variable...

instead of just one provuider interface.
it should contain something like:
physnet2:eth1,physnet3:eth2
---
 hosts                                             | 4 ++--
 roles/neutron-controller/tasks/main.yml           | 2 +-
 roles/nova-compute/templates/nova-compute.service | 2 +-
 test_hosts                                        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hosts b/hosts
index 31f89f5..25738d8 100644
--- a/hosts
+++ b/hosts
@@ -34,7 +34,7 @@ openstack01-node03
 #run_options="-e CASSANDRA_SEEDS=172.23.41.1"
 
 [neutron-controller]
-openstack01-node01 provider_interface_name=ens192
+openstack01-node01 physical_interface_mappings=provider:ens192
 
 [nova-controller]
 openstack01-node03
@@ -46,4 +46,4 @@ openstack01-node03
 openstack01-node01 storage_volume=/dev/loop0
 
 [nova-compute]
-openstack01-node04 provider_interface_name=dummy0
+openstack01-node04 physical_interface_mappings=provider:dummy0
diff --git a/roles/neutron-controller/tasks/main.yml b/roles/neutron-controller/tasks/main.yml
index 0cb1a97..097cbfc 100644
--- a/roles/neutron-controller/tasks/main.yml
+++ b/roles/neutron-controller/tasks/main.yml
@@ -30,7 +30,7 @@
         -e "NOVA_PLACEMENT_PASSWORD={{ secrets['NOVA_PLACEMENT_PASSWORD'] }}"
         -e "NOVA_PLACEMENT_USER=placement"
         -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}"
-        -e "PROVIDER_INTERFACE_NAME={{ provider_interface_name }}"
+        -e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}"
         -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
         -e "RABBIT_USER=openstack"
   tags: env
diff --git a/roles/nova-compute/templates/nova-compute.service b/roles/nova-compute/templates/nova-compute.service
index 1ef9505..cca48fe 100644
--- a/roles/nova-compute/templates/nova-compute.service
+++ b/roles/nova-compute/templates/nova-compute.service
@@ -26,7 +26,7 @@ ExecStart=/usr/bin/docker run --name %n \
     -e "NOVA_PLACEMENT_USER=placement" \
     -e "NOVA_USER=nova" \
     -e "OS_PASSWORD={{ secrets['OS_PASSWORD'] }}" \
-    -e "PROVIDER_INTERFACE_NAME={{ provider_interface_name }}" \
+    -e "PHYSICAL_INTERFACE_MAPPINGS={{ physical_interface_mappings }}" \
     -e "RABBIT_HOST={{ hostvars[groups['rabbitmq'][0]]['listen_ip'] | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}" \
     -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}" \
     -e "RABBIT_USER=openstack" \
diff --git a/test_hosts b/test_hosts
index c92ba6c..f6969ba 100644
--- a/test_hosts
+++ b/test_hosts
@@ -19,10 +19,10 @@ ansible-test-3
 ansible-test-3
 
 [neutron-controller]
-ansible-test provider_interface_name=ens10
+ansible-test physical_interface_mappings=provider:ens10
 
 [nova-controller]
 ansible-test
 
 [nova-compute]
-ansible-test-2 provider_interface_name=ens10
+ansible-test-2 physical_interface_mappings=provider:ens10