From 1514e983babfba29836bf7582023fd1ad3be3a62 Mon Sep 17 00:00:00 2001
From: Kamil Sambor <ksambor@redhat.com>
Date: Fri, 8 Feb 2019 16:52:20 +0100
Subject: [PATCH] Fix generating connections to OVN db

Correct way how we generate ovn db connection
and recognize when ovn_host is IPV4 or IPV6

Change-Id: Iaed7304adf40a87a0f14b7a95339f8416140e947
---
 manifests/profile/base/neutron/agents/ovn.pp      | 2 +-
 manifests/profile/base/neutron/ovn_metadata.pp    | 2 +-
 manifests/profile/base/neutron/plugins/ml2/ovn.pp | 4 ++--
 manifests/profile/pacemaker/ovn_dbs_bundle.pp     | 4 ++--
 manifests/profile/pacemaker/ovn_northd.pp         | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/profile/base/neutron/agents/ovn.pp b/manifests/profile/base/neutron/agents/ovn.pp
index 9f37bbffa..befb91654 100644
--- a/manifests/profile/base/neutron/agents/ovn.pp
+++ b/manifests/profile/base/neutron/agents/ovn.pp
@@ -36,7 +36,7 @@ class tripleo::profile::base::neutron::agents::ovn (
 ) {
   if $step >= 4 {
     class { '::ovn::controller':
-      ovn_remote     => "tcp:${ovn_db_host}:${ovn_sbdb_port}",
+      ovn_remote     => join(['tcp', normalize_ip_for_uri($ovn_db_host), "${ovn_sbdb_port}"], ':'),
     }
   }
 }
diff --git a/manifests/profile/base/neutron/ovn_metadata.pp b/manifests/profile/base/neutron/ovn_metadata.pp
index 5b625b3d8..fe0cf63d5 100644
--- a/manifests/profile/base/neutron/ovn_metadata.pp
+++ b/manifests/profile/base/neutron/ovn_metadata.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::neutron::ovn_metadata (
   if $step >= 4 {
     include ::tripleo::profile::base::neutron
     class { '::neutron::agents::ovn_metadata':
-      ovn_sb_connection => "tcp:${ovn_db_host}:${ovn_sb_port}",
+        ovn_sb_connection => join(['tcp', normalize_ip_for_uri($ovn_db_host), "${ovn_sb_port}"], ':'),
     }
     Service<| title == 'controller' |> -> Service<| title == 'ovn-metadata' |>
   }
diff --git a/manifests/profile/base/neutron/plugins/ml2/ovn.pp b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
index fad907cd5..cf0955f57 100644
--- a/manifests/profile/base/neutron/plugins/ml2/ovn.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
@@ -41,8 +41,8 @@ class tripleo::profile::base::neutron::plugins::ml2::ovn (
 ) {
   if $step >= 4 {
     class { '::neutron::plugins::ml2::ovn':
-      ovn_nb_connection => "tcp:${ovn_db_host}:${ovn_nb_port}",
-      ovn_sb_connection => "tcp:${ovn_db_host}:${ovn_sb_port}",
+      ovn_nb_connection => join(['tcp', normalize_ip_for_uri($ovn_db_host), "${ovn_nb_port}"], ':'),
+      ovn_sb_connection => join(['tcp', normalize_ip_for_uri($ovn_db_host), "${ovn_sb_port}"], ':'),
     }
   }
 }
diff --git a/manifests/profile/pacemaker/ovn_dbs_bundle.pp b/manifests/profile/pacemaker/ovn_dbs_bundle.pp
index 0a6a6c762..0cf9b0fc2 100644
--- a/manifests/profile/pacemaker/ovn_dbs_bundle.pp
+++ b/manifests/profile/pacemaker/ovn_dbs_bundle.pp
@@ -93,7 +93,7 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
           before   => Pacemaker::Resource::Bundle['ovn-dbs-bundle'],
         }
       }
-
+      $ovn_dbs_vip_norm = normalize_ip_for_uri($ovn_dbs_vip)
       $ovn_dbs_location_rule = {
         resource_discovery => 'exclusive',
         score              => 0,
@@ -144,7 +144,7 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
         ocf_agent_name  => "${ovndb_servers_ocf_name}",
         master_params   => '',
         op_params       => 'start timeout=200s stop timeout=200s',
-        resource_params => "master_ip=${ovn_dbs_vip} nb_master_port=${nb_db_port} \
+        resource_params => "master_ip=${ovn_dbs_vip_norm} nb_master_port=${nb_db_port} \
 sb_master_port=${sb_db_port} manage_northd=yes inactive_probe_interval=180000",
         tries           => $pcs_tries,
         location_rule   => $ovn_dbs_location_rule,
diff --git a/manifests/profile/pacemaker/ovn_northd.pp b/manifests/profile/pacemaker/ovn_northd.pp
index 45138cb65..1dadbdf36 100644
--- a/manifests/profile/pacemaker/ovn_northd.pp
+++ b/manifests/profile/pacemaker/ovn_northd.pp
@@ -73,7 +73,7 @@ class tripleo::profile::pacemaker::ovn_northd (
     $ovndb_servers_resource_name = 'ovndb_servers'
     $ovndb_servers_ocf_name      = 'ovn:ovndb-servers'
     $ovndb_vip_resource_name     = "ip-${ovn_dbs_vip}"
-
+    $ovn_dbs_vip_norm = normalize_ip_for_uri($ovn_dbs_vip)
     # By step 3, all the VIPs would have been created.
     # After creating ovn ocf resource, colocate it with the
     # VIP - ip-${ovn_dbs_vip}.
@@ -81,7 +81,7 @@ class tripleo::profile::pacemaker::ovn_northd (
       ocf_agent_name  => "${ovndb_servers_ocf_name}",
       master_params   => '',
       op_params       => 'start timeout=200s stop timeout=200s',
-      resource_params => "master_ip=${ovn_dbs_vip} nb_master_port=${nb_db_port} \
+      resource_params => "master_ip=${ovn_dbs_vip_norm} nb_master_port=${nb_db_port} \
 sb_master_port=${sb_db_port} manage_northd=yes inactive_probe_interval=180000",
       tries           => $pcs_tries,
       location_rule   => {