Gate: Cleanup scripts for k8s keystone auth gate

This PS cleans up the scripts for the k8s k8s keystone auth gate.

Change-Id: I248439f9b8ffa372dfaba5acba0c8c587231d901
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-10-09 11:27:35 -05:00 committed by Steve Wilkerson
parent 100c900da0
commit 8bb71f6659
9 changed files with 104 additions and 8 deletions

View File

@ -0,0 +1,20 @@
#!/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: Move into openstack-helm root dir & Run client setup script
cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/020-setup-client.sh

View File

@ -0,0 +1,52 @@
#!/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
make ingress
#NOTE: Deploy global ingress
tee /tmp/ingress-kube-system.yaml << EOF
deployment:
mode: cluster
type: DaemonSet
network:
host_namespace: true
EOF
helm upgrade --install ingress-kube-system ./ingress \
--namespace=kube-system \
--values=/tmp/ingress-kube-system.yaml
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh kube-system
#NOTE: Display info
helm status ingress-kube-system
#NOTE: Deploy namespace ingress
for NAMESPACE in openstack; do
helm upgrade --install ingress-${NAMESPACE} ./ingress \
--namespace=${NAMESPACE} \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ${NAMESPACE}
#NOTE: Display info
helm status ingress-${NAMESPACE}
done

View File

@ -0,0 +1 @@
../developer/nfs/030-nfs-provisioner.sh

View File

@ -0,0 +1 @@
../openstack-support/025-rabbitmq.sh

View File

@ -0,0 +1 @@
../openstack-support/030-memcached.sh

View File

@ -0,0 +1 @@
../openstack-support/035-mariadb.sh

View File

@ -0,0 +1,20 @@
#!/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: Move into openstack-helm root dir & Run keystone deployment script
cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/080-keystone.sh

View File

@ -185,11 +185,11 @@
kubernetes_keystone_auth: true
gate_fqdn_test: true
gate_scripts:
- cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/020-setup-client.sh
- cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/030-ingress.sh
- cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/040-nfs-provisioner.sh
- cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/050-mariadb.sh
- cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/060-rabbitmq.sh
- cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/070-memcached.sh
- cd "${OSH_PATH}"; ./tools/deployment/developer/nfs/080-keystone.sh
- ./tools/deployment/keystone-auth/check.sh
- ./tools/deployment/keystone-auth/010-setup-client.sh
- ./tools/deployment/keystone-auth/020-ingress.sh
- ./tools/deployment/keystone-auth/030-nfs-provisioner.sh
- ./tools/deployment/keystone-auth/040-rabbitmq.sh
- ./tools/deployment/keystone-auth/050-memcached.sh
- ./tools/deployment/keystone-auth/060-mariadb.sh
- ./tools/deployment/keystone-auth/070-keystone.sh
- ./tools/deployment/keystone-auth/080-check.sh