f2108855f5
With the move to helm v3, helm status requires a namespace to be specified, but doing so breaks helm v2 compatability. In order to preserve our gating with both versions of helm while we make the change from v2 to v3, this change removes the usage of helm serve in openstack-helm's deployment scripts. Once we fully move to helm v3, these scripts can be improved and cleaned up to be more compatible with the new v3 syntax. Change-Id: I02b6bbf780abf8c8bc7c1783c35d9411d25e18a8
77 lines
2.7 KiB
Bash
Executable File
77 lines
2.7 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# 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: Get the over-rides to use
|
|
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
|
|
: ${OSH_EXTRA_HELM_ARGS_LDAP:="$(./tools/deployment/common/get-values-overrides.sh ldap)"}
|
|
|
|
#NOTE: Deploy command
|
|
: ${OSH_EXTRA_HELM_ARGS:=""}
|
|
|
|
helm upgrade --install ldap ${HELM_CHART_ROOT_PATH}/ldap \
|
|
--namespace=openstack \
|
|
--set pod.replicas.server=1 \
|
|
--set bootstrap.enabled=true \
|
|
${OSH_EXTRA_HELM_ARGS} \
|
|
${OSH_EXTRA_HELM_ARGS_LDAP}
|
|
|
|
#NOTE: Wait for deploy
|
|
./tools/deployment/common/wait-for-pods.sh openstack
|
|
|
|
#NOTE: Get the over-rides to use
|
|
export HELM_CHART_ROOT_PATH="../openstack-helm"
|
|
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"}
|
|
|
|
#NOTE: Handle Keystone
|
|
make pull-images keystone
|
|
|
|
#NOTE: Deploy command
|
|
: ${OSH_EXTRA_HELM_ARGS:=""}
|
|
helm upgrade --install keystone ./keystone \
|
|
--namespace=openstack \
|
|
--values=./keystone/values_overrides/ldap.yaml \
|
|
${OSH_EXTRA_HELM_ARGS} \
|
|
${OSH_EXTRA_HELM_ARGS_KEYSTONE}
|
|
|
|
#NOTE: Wait for deploy
|
|
./tools/deployment/common/wait-for-pods.sh openstack
|
|
|
|
#NOTE: Validate Deployment info
|
|
export OS_CLOUD=openstack_helm
|
|
sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
|
|
openstack endpoint list
|
|
|
|
#NOTE: Do some additional queries here for LDAP
|
|
openstack domain list
|
|
openstack user list
|
|
openstack user list --domain ldapdomain
|
|
|
|
openstack role add --user bob --project admin --user-domain ldapdomain --project-domain default admin
|
|
|
|
domain="ldapdomain"
|
|
domainId=$(openstack domain show ${domain} -f value -c id)
|
|
token=$(openstack token issue -f value -c id)
|
|
|
|
#NOTE: Testing we can auth against the LDAP user
|
|
unset OS_CLOUD
|
|
openstack --os-auth-url http://keystone.openstack.svc.cluster.local/v3 --os-username bob --os-password password --os-user-domain-name ${domain} --os-identity-api-version 3 token issue
|
|
|
|
#NOTE: Test the domain specific thing works
|
|
curl --verbose -X GET \
|
|
-H "Content-Type: application/json" \
|
|
-H "X-Auth-Token: $token" \
|
|
http://keystone.openstack.svc.cluster.local/v3/domains/${domainId}/config
|