Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base-helm-configs/kube-ovn/kube-ovn-helm-overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions bin/create-secrets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions bin/install-nova.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
)


Expand Down
Loading