Merge "Fix external API interface with out an IP address"

ansible/filter_plugins/networks.py

@@ -211,6 +211,8 @@ def net_interface_obj(context, name, inventory_hostname=None):
     rules = net_rules(context, name, inventory_hostname)
     bootproto = net_bootproto(context, name, inventory_hostname)
     defroute = net_defroute(context, name, inventory_hostname)
+    vip_address = net_vip_address(context, name, inventory_hostname)
+    allowed_addresses = [vip_address] if vip_address else None
     interface = {
         'device': device,
         'address': ip,
@@ -222,6 +224,7 @@ def net_interface_obj(context, name, inventory_hostname=None):
         'rules': rules,
         'bootproto': bootproto or 'static',
         'defroute': defroute,
+        'allowed_addresses': allowed_addresses,
         'onboot': 'yes',
     }
     interface = {k: v for k, v in interface.items() if v is not None}
@@ -255,6 +258,8 @@ def net_bridge_obj(context, name, inventory_hostname=None):
     rules = net_rules(context, name, inventory_hostname)
     bootproto = net_bootproto(context, name, inventory_hostname)
     defroute = net_defroute(context, name, inventory_hostname)
+    vip_address = net_vip_address(context, name, inventory_hostname)
+    allowed_addresses = [vip_address] if vip_address else None
     interface = {
         'device': device,
         'address': ip,
@@ -267,6 +272,7 @@ def net_bridge_obj(context, name, inventory_hostname=None):
         'rules': rules,
         'bootproto': bootproto or 'static',
         'defroute': defroute,
+        'allowed_addresses': allowed_addresses,
         'onboot': 'yes',
     }
     interface = {k: v for k, v in interface.items() if v is not None}
@@ -306,6 +312,8 @@ def net_bond_obj(context, name, inventory_hostname=None):
     rules = net_rules(context, name, inventory_hostname)
     bootproto = net_bootproto(context, name, inventory_hostname)
     defroute = net_defroute(context, name, inventory_hostname)
+    vip_address = net_vip_address(context, name, inventory_hostname)
+    allowed_addresses = [vip_address] if vip_address else None
     interface = {
         'device': device,
         'address': ip,
@@ -324,6 +332,7 @@ def net_bond_obj(context, name, inventory_hostname=None):
         'rules': rules,
         'bootproto': bootproto or 'static',
         'defroute': defroute,
+        'allowed_addresses': allowed_addresses,
         'onboot': 'yes',
     }
     interface = {k: v for k, v in interface.items() if v is not None}

releasenotes/notes/external-api-no-ip-f04951ffc9659949.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Fixes an issue when configuring the external API network interface on
+    controllers without an IP address which would cause ``kayobe overcloud host
+    configure`` to fail on a host with an active virtual IP address.  See
+    `story 2007736 <https://storyboard.openstack.org/#!/story/2007736>`__ for
+    details.

requirements.yml

@@ -5,7 +5,7 @@
   # There are no versioned releases of this role.
   version: a5c3c19d0cda7b6960c9200a30b5dbe73d2eef96
 - src: MichaelRigart.interfaces
-  version: v1.4.1
+  version: v1.5.0
 - src: mrlesmithjr.manage-lvm
   version: v0.1.4
 - src: mrlesmithjr.mdadm