diff --git a/base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml b/base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml index 951ce401..200bd321 100644 --- a/base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml +++ b/base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml @@ -9,7 +9,7 @@ global: kubeovn: repository: kube-ovn vpcRepository: vpc-nat-gateway - tag: v1.14.15 + tag: v1.13.14 support_arm: true thirdparty: true diff --git a/bin/create-secrets.sh b/bin/create-secrets.sh index 81008786..b72e7e53 100755 --- a/bin/create-secrets.sh +++ b/bin/create-secrets.sh @@ -366,12 +366,12 @@ data: apiVersion: v1 kind: Secret metadata: - name: nova-ssh-keypair + name: nova-ssh namespace: openstack type: Opaque data: - public_key: $(echo -n $nova_ssh_public_key | base64 -w0) - private_key: $(echo -n "$nova_ssh_private_key" | base64 -w0) + public-key: $(echo $nova_ssh_public_key | base64 -w0) + private-key: $(echo "$nova_ssh_private_key" | base64 -w0) --- apiVersion: v1 kind: Secret diff --git a/bin/install-nova.sh b/bin/install-nova.sh index 065d564d..693edf45 100755 --- a/bin/install-nova.sh +++ b/bin/install-nova.sh @@ -108,8 +108,8 @@ set_args=( --set "conf.nova.keystone_authtoken.memcache_secret_key=$(kubectl --namespace openstack get secret os-memcached -o jsonpath='{.data.memcache_secret_key}' | base64 -d)" --set "endpoints.oslo_messaging.auth.admin.password=$(kubectl --namespace openstack get secret rabbitmq-default-user -o jsonpath='{.data.password}' | base64 -d)" --set "endpoints.oslo_messaging.auth.nova.password=$(kubectl --namespace openstack get secret nova-rabbitmq-password -o jsonpath='{.data.password}' | base64 -d)" - --set "network.ssh.public_key=$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.public_key}' | base64 -d)" - --set "network.ssh.private_key=$(kubectl -n openstack get secret nova-ssh-keypair -o jsonpath='{.data.private_key}' | base64 -d)" + --set "network.ssh.public_key=$(kubectl -n openstack get secret nova-ssh -o jsonpath='{.data.public-key}' | base64 -d)" + --set "network.ssh.private_key=$(kubectl -n openstack get secret nova-ssh -o jsonpath='{.data.private-key}' | base64 -d)" )