Skip to content

Commit b968cde

Browse files
committed
Quickfix: Hardcode otcavia_ovn for CCM Loadbalancers.
OVN LBs are the better choice if you don't need L7. And they are the only ones that work on CiaB. Let's default to them. We will provide settings for these later. Signed-off-by: Kurt Garloff <kurt@garloff.de>
1 parent 854fc1a commit b968cde

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

04-cloud-secret.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@ kubectl create namespace "$CS_NAMESPACE" || true
2222
if ! test -r "$CLOUDS_YAML"; then echo "clouds.yaml $CLOUDS_YAML not readable"; exit 2; fi
2323
CA=$(grep -A12 "^\s\s*$OS_CLOUD:\s*\$" $CLOUDS_YAML | grep 'cacert:' | head -n1 | sed 's/^ *cacert: //')
2424
OS_CACERT=${OS_CACERT:-$CA}
25+
# FIXME: We will provide more settings in cluster-settings.env later, hardcode it for now
26+
#if test "$CS_CCMLB=octavia-ovn"; then OCTOVN="--set octavia_ovn=true"; else unset OCTOVN; fi
27+
OCTOVN="--set octavia_ovn=true"
2528
if test -n "$OS_CACERT"; then
2629
echo "Found CA cert file configured to be $OS_CACERT"
2730
if test ! -r "$OS_CACERT"; then echo "... but could not access it. FATAL."; exit 3; fi
2831
# Call the helm helper chart now
29-
helm upgrade -i openstack-secrets -n "$CS_NAMESPACE" --create-namespace https://github.com/SovereignCloudStack/openstack-csp-helper/releases/latest/download/openstack-csp-helper.tgz -f $CLOUDS_YAML --set cacert="$(cat $OS_CACERT)"
32+
helm upgrade -i openstack-secrets -n "$CS_NAMESPACE" --create-namespace https://github.com/SovereignCloudStack/openstack-csp-helper/releases/latest/download/openstack-csp-helper.tgz -f $CLOUDS_YAML --set cacert="$(cat $OS_CACERT)" $OCTOVN
3033
else
31-
helm upgrade -i openstack-secrets -n "$CS_NAMESPACE" --create-namespace https://github.com/SovereignCloudStack/openstack-csp-helper/releases/latest/download/openstack-csp-helper.tgz -f $CLOUDS_YAML
34+
helm upgrade -i openstack-secrets -n "$CS_NAMESPACE" --create-namespace https://github.com/SovereignCloudStack/openstack-csp-helper/releases/latest/download/openstack-csp-helper.tgz -f $CLOUDS_YAML $OCTOVN
3235
fi

0 commit comments

Comments
 (0)