From cd4fe5dbc8f458dc8463662aed9ab5e65f9b8903 Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Wed, 10 Jul 2019 09:19:49 -0400
Subject: [PATCH] Remove Cloud-Provider-Openstack from Build

Cloud-Provider-Openstack is required for Keystone authentication with
Kubernetes. Since we are no longer doing that, we can remove
Cloud-Provider-Openstack from the build.

Story: 2002843
Task: 26958

Change-Id: I971ba2626ab040631c163957fbe6efbd58951ad1
Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
---
 centos_iso_image.inc                          |  3 ---
 centos_pkg_dirs                               |  1 -
 .../centos/build_srpm.data                    |  5 -----
 .../centos/cloud-provider-openstack.spec      | 22 -------------------
 4 files changed, 31 deletions(-)
 delete mode 100644 kubernetes/cloud-provider-openstack/centos/build_srpm.data
 delete mode 100644 kubernetes/cloud-provider-openstack/centos/cloud-provider-openstack.spec

diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index 72b1b8827..4acce75ae 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -87,9 +87,6 @@ influxdb-extensions
 docker-distribution
 registry-token-server
 
-# kubernetes keystone authentication
-cloud-provider-openstack
-
 # helm
 helm
 
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index 0ad33e60c..1251a2ef6 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -88,7 +88,6 @@ kubernetes/docker-distribution
 kubernetes/etcd
 kubernetes/helm
 kubernetes/registry-token-server
-kubernetes/cloud-provider-openstack
 logging/logmgmt
 filesystem/filesystem-scripts
 config-files/io-scheduler
diff --git a/kubernetes/cloud-provider-openstack/centos/build_srpm.data b/kubernetes/cloud-provider-openstack/centos/build_srpm.data
deleted file mode 100644
index 214e82770..000000000
--- a/kubernetes/cloud-provider-openstack/centos/build_srpm.data
+++ /dev/null
@@ -1,5 +0,0 @@
-TAR_NAME="cloud-provider-openstack"
-COPY_LIST=" \
-  $STX_BASE/downloads/cloud-provider-openstack-1.13.1-linux-amd64.tar.gz \
-"
-TIS_PATCH_VER=0
diff --git a/kubernetes/cloud-provider-openstack/centos/cloud-provider-openstack.spec b/kubernetes/cloud-provider-openstack/centos/cloud-provider-openstack.spec
deleted file mode 100644
index e3845a22c..000000000
--- a/kubernetes/cloud-provider-openstack/centos/cloud-provider-openstack.spec
+++ /dev/null
@@ -1,22 +0,0 @@
-Name:           cloud-provider-openstack
-Version:        1.13.1
-Release:        1%{?_tis_dist}.%{tis_patch_ver}
-Summary:        For Kubernetes to work with Openstack
-License:        ASL 2.0
-Source0:        cloud-provider-openstack-1.13.1-linux-amd64.tar.gz
-
-ExclusiveArch:  x86_64
-
-%description
-For Kubernetes to work with Openstack. For example, Keystone authentication.
-
-%prep
-%setup -n cloud-provider-openstack
-
-%install
-install -d -p %{buildroot}%{_bindir}
-install -p -m 0755 client-keystone-auth %{buildroot}%{_bindir}
-
-%files
-%doc LICENSE
-%{_bindir}/client-keystone-auth