
This PS delivers the following changes: - adds values_overrides folders into utility binaries charts for flexible testing the charts and images; - values_overrides added to .helmignore files for every chart; - added munch python package into bionic images for compartibility with newer openstack client dependences; - improved Makefile clean section; - uses treasuremap v1.9 deploy-k8s.sh script to deploy test k8s cluster; - adds appropriate changes to deploy k8s script, setup apparmor; - porthole utility charts deployment script have been enriched with and ability to control additional values from values_overrides folders of each chart; - added env-variables.sh and get-values-overrides.sh to power up the changes describes in previous point; - removed deploy.sh script for clarity of actions in playbooks; - improved airship-porthole-gate-runner playbook; - removed install-deps playbook that was used to pre-setup zuul gate; - united make-unit-tests and make-feature-tests playbooks into one make-functional tests playbook; - helm version has been bumped up to 3.11.1; - improved helm_tk.sh script in order to solve issues with multiple charts build process; - bumped up version of stable helm-toolkit used for charts build; - airship-porthole-gate-runner playbook is now used as pre-run script for tox profiles gates and as main run playbook for functional tests gate; Change-Id: I202c573ff85ed2b80191057b537a65a5f5d4600e
72 lines
1.9 KiB
Bash
Executable File
72 lines
1.9 KiB
Bash
Executable File
#!/bin/bash
|
|
CURRENT_DIR="$(pwd)"
|
|
: "${OSH_PATH:="../openstack-helm"}"
|
|
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
|
|
|
|
# remove previous loop devices if any
|
|
|
|
if [ -f /etc/systemd/system/local-fs.target.wants/loops-setup.service ]
|
|
then
|
|
sudo systemctl stop loops-setup
|
|
fi
|
|
|
|
cd "${OSH_PATH}" || exit
|
|
sudo bash -c "./tools/deployment/component/ceph/ceph.sh"
|
|
|
|
namespace="utility"
|
|
: ${OSH_EXTRA_HELM_ARGS:=""}
|
|
|
|
cd "${OSH_INFRA_PATH}"
|
|
#Deploy Ceph-provisioners
|
|
tee /tmp/ceph-utility-config.yaml <<EOF
|
|
endpoints:
|
|
identity:
|
|
namespace: openstack
|
|
object_store:
|
|
namespace: ceph
|
|
ceph_mon:
|
|
namespace: ceph
|
|
network:
|
|
public: 172.17.0.1/16
|
|
cluster: 172.17.0.1/16
|
|
deployment:
|
|
storage_secrets: false
|
|
ceph: false
|
|
rbd_provisioner: false
|
|
cephfs_provisioner: false
|
|
csi_rbd_provisioner: false
|
|
client_secrets: true
|
|
rgw_keystone_user_and_endpoints: false
|
|
bootstrap:
|
|
enabled: false
|
|
conf:
|
|
rgw_ks:
|
|
enabled: true
|
|
pod:
|
|
mandatory_access_control:
|
|
type: apparmor
|
|
ceph-utility-config-ceph-ns-key-generator :
|
|
ceph-storage-keys-generator: runtime/default
|
|
init: runtime/default
|
|
EOF
|
|
|
|
helm upgrade --install ceph-utility-config ./ceph-provisioners \
|
|
--namespace=$namespace \
|
|
--values=/tmp/ceph-utility-config.yaml \
|
|
${OSH_EXTRA_HELM_ARGS} \
|
|
${OSH_INFRA_EXTRA_HELM_ARGS_CEPH_DEPLOY:-$(./tools/deployment/common/get-values-overrides.sh ceph-provisioners)} \
|
|
${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
|
|
|
|
# Deploy Ceph-Utility
|
|
cd ${CURRENT_DIR}
|
|
|
|
export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${PORTHOLE_PATH:="../porthole/charts"}"}"
|
|
: ${PORTHOLE_EXTRA_HELM_ARGS_CEPH_UTILITY:="$(./tools/deployment/get-values-overrides.sh ceph-utility)"}
|
|
|
|
helm upgrade --install ceph-utility ./artifacts/ceph-utility.tgz --namespace=$namespace \
|
|
${PORTHOLE_EXTRA_HELM_ARGS_CEPH_UTILITY}
|
|
|
|
# Wait for Deployment
|
|
: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
|
|
cd "${OSH_INFRA_PATH}"
|
|
./tools/deployment/common/wait-for-pods.sh $namespace |