From 1f5b8375f8bfa107d3bc0bcb3ca843239bd7d7a9 Mon Sep 17 00:00:00 2001
From: Jerry Sun <jerry.sun@windriver.com>
Date: Tue, 9 Apr 2019 12:51:12 -0400
Subject: [PATCH] Add Cloud-Provider-Openstack to Build

Cloud-Provider-Openstack is required for Keystone authentication with
Kubernetes. This commit brings in Cloud-Provider-Openstack as a
pre-built binary to shove into an RPM as part of the ISO. The source
is also downloaded, but not used at the moment.

Story: 2002843
Task: 26958
Depends-On: https://review.openstack.org/651326

Change-Id: If2a7a1d696370c8e40a11f8002c9a597406eb2db
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 insertions(+)
 create mode 100644 kubernetes/cloud-provider-openstack/centos/build_srpm.data
 create mode 100644 kubernetes/cloud-provider-openstack/centos/cloud-provider-openstack.spec

diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index ea159fcb6..5d5c5eacb 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -87,6 +87,9 @@ 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 a7dfd7af0..c6fb9c6fa 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -88,6 +88,7 @@ kubernetes/kubernetes
 kubernetes/docker-distribution
 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
new file mode 100644
index 000000000..214e82770
--- /dev/null
+++ b/kubernetes/cloud-provider-openstack/centos/build_srpm.data
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 000000000..e3845a22c
--- /dev/null
+++ b/kubernetes/cloud-provider-openstack/centos/cloud-provider-openstack.spec
@@ -0,0 +1,22 @@
+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