ff1f75fc45
If OSH_INFRA_PATH is never used in the openstack-helm-infra repository, as all the references are using relative paths. The keystone script is not using a relative path, and relies on OSH_INFRA_PATH to be defined to work. This is a problem, because when it is not defined, the expected path for ldap chart is /ldap, which is an incorrect path. This fixes the problem by ensuring the path is relative. Change-Id: I04a8d5c074b7c1e6fa66617bbb907f2ad4dcb3af
49 lines
1.5 KiB
Bash
Executable File
49 lines
1.5 KiB
Bash
Executable File
#!/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
|
|
|
|
: ${OSH_PATH:="../openstack-helm"}
|
|
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
|
|
: ${OSH_EXTRA_HELM_ARGS:=""}
|
|
|
|
# Install LDAP
|
|
make ldap
|
|
helm upgrade --install ldap ./ldap \
|
|
--namespace=openstack \
|
|
--set pod.replicas.server=1 \
|
|
--set bootstrap.enabled=true \
|
|
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
|
${OSH_INFRA_EXTRA_HELM_ARGS_LDAP}
|
|
|
|
./tools/deployment/common/wait-for-pods.sh openstack
|
|
helm status ldap
|
|
|
|
# Install Keystone
|
|
helm upgrade --install keystone ${OSH_PATH}/keystone \
|
|
--namespace=openstack \
|
|
--values=${OSH_PATH}/tools/overrides/keystone/ldap_domain_config.yaml \
|
|
${OSH_EXTRA_HELM_ARGS} \
|
|
${OSH_EXTRA_HELM_ARGS_KEYSTONE}
|
|
|
|
./tools/deployment/common/wait-for-pods.sh openstack
|
|
helm status keystone
|
|
|
|
# Testing basic functionality
|
|
export OS_CLOUD=openstack_helm
|
|
sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
|
|
openstack endpoint list
|