From 75b9802c4e6fc0a6fc663200edab02ef97cdcae3 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Thu, 7 Feb 2019 08:05:56 -0600
Subject: [PATCH] Add radosgateway to openstack support job

This adds the required services to the openstack-support job to
deploy ceph radosgateway with keystone auth enabled. This expands
coverage for radosgateway helm tests in the openstack-helm-infra
repository

Change-Id: I3a5505ad3d3400563694ef063b4e6777ba34c414
---
 .../openstack-support/070-mariadb.sh          |  1 +
 .../openstack-support/080-setup-client.sh     |  1 +
 .../openstack-support/090-keystone.sh         |  1 +
 .../100-ceph-radosgateway.sh                  | 65 +++++++++++++++++++
 zuul.d/jobs.yaml                              |  6 ++
 5 files changed, 74 insertions(+)
 create mode 120000 tools/deployment/openstack-support/070-mariadb.sh
 create mode 120000 tools/deployment/openstack-support/080-setup-client.sh
 create mode 120000 tools/deployment/openstack-support/090-keystone.sh
 create mode 100755 tools/deployment/openstack-support/100-ceph-radosgateway.sh

diff --git a/tools/deployment/openstack-support/070-mariadb.sh b/tools/deployment/openstack-support/070-mariadb.sh
new file mode 120000
index 000000000..fbdc02262
--- /dev/null
+++ b/tools/deployment/openstack-support/070-mariadb.sh
@@ -0,0 +1 @@
+../keystone-auth/060-mariadb.sh
\ No newline at end of file
diff --git a/tools/deployment/openstack-support/080-setup-client.sh b/tools/deployment/openstack-support/080-setup-client.sh
new file mode 120000
index 000000000..afa46dfac
--- /dev/null
+++ b/tools/deployment/openstack-support/080-setup-client.sh
@@ -0,0 +1 @@
+../keystone-auth/010-setup-client.sh
\ No newline at end of file
diff --git a/tools/deployment/openstack-support/090-keystone.sh b/tools/deployment/openstack-support/090-keystone.sh
new file mode 120000
index 000000000..b937970fc
--- /dev/null
+++ b/tools/deployment/openstack-support/090-keystone.sh
@@ -0,0 +1 @@
+../keystone-auth/070-keystone.sh
\ No newline at end of file
diff --git a/tools/deployment/openstack-support/100-ceph-radosgateway.sh b/tools/deployment/openstack-support/100-ceph-radosgateway.sh
new file mode 100755
index 000000000..0606fc424
--- /dev/null
+++ b/tools/deployment/openstack-support/100-ceph-radosgateway.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+set -xe
+
+#NOTE: Lint and package chart
+: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+make -C ${OSH_INFRA_PATH} ceph-rgw
+
+#NOTE: Deploy command
+: ${OSH_EXTRA_HELM_ARGS:=""}
+tee /tmp/radosgw-openstack.yaml <<EOF
+endpoints:
+  identity:
+    namespace: openstack
+  object_store:
+    namespace: openstack
+  ceph_mon:
+    namespace: ceph
+network:
+  public: 172.17.0.1/16
+  cluster: 172.17.0.1/16
+deployment:
+  ceph: true
+  rgw_keystone_user_and_endpoints: true
+bootstrap:
+  enabled: false
+conf:
+  rgw_ks:
+    enabled: true
+pod:
+  replicas:
+    rgw: 1
+EOF
+helm upgrade --install radosgw-openstack ${OSH_INFRA_PATH}/ceph-rgw \
+  --namespace=openstack \
+  --values=/tmp/radosgw-openstack.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_CEPH_RGW}
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack
+
+#NOTE: Validate Deployment info
+helm status radosgw-openstack
+export OS_CLOUD=openstack_helm
+sleep 60 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
+
+openstack service list
+openstack endpoint list
+
+helm test radosgw-openstack
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d8739b0c0..efb958d8e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -198,6 +198,8 @@
     timeout: 7200
     pre-run: playbooks/osh-infra-upgrade-host.yaml
     run: playbooks/osh-infra-gate-runner.yaml
+    required-projects:
+      - openstack/openstack-helm
     post-run: playbooks/osh-infra-collect-logs.yaml
     nodeset: openstack-helm-single-node
     vars:
@@ -211,6 +213,10 @@
         - ./tools/deployment/openstack-support/040-memcached.sh
         - ./tools/deployment/openstack-support/050-libvirt.sh
         - ./tools/deployment/openstack-support/060-openvswitch.sh
+        - ./tools/deployment/openstack-support/070-mariadb.sh
+        - ./tools/deployment/openstack-support/080-setup-client.sh
+        - ./tools/deployment/openstack-support/090-keystone.sh
+        - ./tools/deployment/openstack-support/100-ceph-radosgateway.sh
 
 - job:
     name: openstack-helm-infra-five-ubuntu