From 055e0db0c2d1222b1d19e4e89fd27efba91f5ae2 Mon Sep 17 00:00:00 2001
From: Tao Liu <tao.liu@windriver.com>
Date: Tue, 19 Mar 2019 17:32:51 -0400
Subject: [PATCH] Distributed Cloud configuration

Cleanup the keystone bootstrap endpoints on the sub-clouds

Story: 2004766
Task: 30107

Change-Id: I5231dad791202b7c1653aab90932955eed6d0820
Signed-off-by: Tao Liu <tao.liu@windriver.com>
---
 .../modules/openstack/manifests/keystone.pp   | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/puppet-manifests/src/modules/openstack/manifests/keystone.pp b/puppet-manifests/src/modules/openstack/manifests/keystone.pp
index 922119bf52..9a61088426 100644
--- a/puppet-manifests/src/modules/openstack/manifests/keystone.pp
+++ b/puppet-manifests/src/modules/openstack/manifests/keystone.pp
@@ -160,6 +160,22 @@ class openstack::keystone::haproxy
   }
 }
 
+define delete_endpoints (
+  $region,
+  $service,
+  $interfaces,
+) {
+  $rc_file = '/etc/platform/openrc'
+  $delete_endpoint = 'openstack endpoint delete'
+  $interfaces.each | String $val | {
+    $get_endpoint_id = "openstack endpoint list --region ${region} --service ${service} --interface ${val} -f value -c ID"
+    exec { "Delete ${region} ${service} ${val} endpoint":
+      command   => "source ${rc_file} && ${get_endpoint_id} | xargs ${delete_endpoint}",
+      logoutput => true,
+      provider  => shell,
+    }
+  }
+}
 
 class openstack::keystone::api
   inherits ::openstack::keystone::params {
@@ -175,8 +191,14 @@ class openstack::keystone::api
     # the subcloud region.
     if ($::platform::params::distributed_cloud_role == 'subcloud' and
         $::platform::params::region_2_name != 'RegionOne') {
+      $interfaces = [ 'public', 'internal', 'admin' ]
       Keystone_endpoint<||> -> Class['::platform::client']
-      # TODO: use exec openstack endpoint delete commands to clean up the bootstrap endpoints
+      # clean up the bootstrap endpoints
+      -> delete_endpoints { 'Start delete endpoints':
+        region     => 'RegionOne',
+        service    => 'keystone',
+        interfaces => $interfaces,
+      }
     }
   }