diff --git a/manifests/pacemaker/haproxy_with_vip.pp b/manifests/pacemaker/haproxy_with_vip.pp
index a27b94bbd..1fc3ff7f7 100644
--- a/manifests/pacemaker/haproxy_with_vip.pp
+++ b/manifests/pacemaker/haproxy_with_vip.pp
@@ -57,17 +57,25 @@ define tripleo::pacemaker::haproxy_with_vip(
   $ensure        = true)
 {
   if($ensure) {
+    # NB: Until the IPaddr2 RA has a fix for https://bugzilla.redhat.com/show_bug.cgi?id=1445628
+    # we need to specify the nic when creating the ipv6 vip.
     if is_ipv6_address($ip_address) {
-      $netmask = '64'
+      $netmask        = '128'
+      $nic            = interface_for_ip($ip_address)
+      $ipv6_addrlabel = '99'
     } else {
-      $netmask = '32'
+      $netmask        = '32'
+      $nic            = ''
+      $ipv6_addrlabel = ''
     }
 
     pacemaker::resource::ip { "${vip_name}_vip":
-      ip_address    => $ip_address,
-      cidr_netmask  => $netmask,
-      location_rule => $location_rule,
-      tries         => $pcs_tries,
+      ip_address     => $ip_address,
+      cidr_netmask   => $netmask,
+      nic            => $nic,
+      ipv6_addrlabel => $ipv6_addrlabel,
+      location_rule  => $location_rule,
+      tries          => $pcs_tries,
     }
     pacemaker::constraint::order { "${vip_name}_vip-then-haproxy":
       first_resource    => "ip-${ip_address}",