d74e937726
The work of enable dpdk in starlingx needs to achieve the overrides of parameters such as images, tags, labels, and pods. This function is being implemented through the support of ovs per-host overrides. In order to transfer the parameters such as images after overrides to the daemonset file to achieve the corresponding functions, the functions of overrides need to be upgraded. Move the $daemonset_yaml parameter in the daemonset file to the overrides file, so that daemonset file uses parameters after overrides.This patch and https://review.opendev.org/#/c/707775/ depend on each other. Change-Id: I210e54b28e32ba1b8e281659fee8e6eda38d79d0 Story: 2007291 Task: 38754 Depends-on: https://review.opendev.org/#/c/708894/ Signed-off-by: songgongjun <gongjun.song@intel.com>
53 lines
1.6 KiB
Bash
Executable File
53 lines
1.6 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:=""}
|
|
: ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"}
|
|
|
|
# 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
|
|
cd ${OSH_PATH}
|
|
make keystone
|
|
cd -
|
|
helm upgrade --install keystone ${OSH_PATH}/keystone \
|
|
--namespace=openstack \
|
|
--values=${OSH_PATH}/keystone/values_overrides/ldap.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
|