Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Federation Variable Names and Secrets #976

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Update Federation Variable Names and Secrets #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ endif
# encoded. e.g. head --bytes=32 /dev/urandom | base64
BARBICAN_SIMPLE_CRYPTO_ENCRYPTION_KEY ?= sEFmdFjDUqRM2VemYslV5yGNWjokioJXsg8Nrlc3drU=
KEYSTONE_FEDERATION_CLIENT_SECRET ?= COX8bmlKAWn56XCGMrKQJj7dgHNAOl6f
KEYSTONE_CRYPTO_PASSPHRASE ?= openstack
KEYSTONE_FEDERATION_CRYPTO_PASSPHRASE ?= openstack

# Allows overriding the cleanup command used in *_cleanup targets.
# Useful in CI, to allow injectin kustomization in each operator CR directory
Expand Down Expand Up @@ -540,7 +540,7 @@ ${1}: export METADATA_SHARED_SECRET=${METADATA_SHARED_SECRET}
${1}: export HEAT_AUTH_ENCRYPTION_KEY=${HEAT_AUTH_ENCRYPTION_KEY}
${1}: export BARBICAN_SIMPLE_CRYPTO_ENCRYPTION_KEY=${BARBICAN_SIMPLE_CRYPTO_ENCRYPTION_KEY}
${1}: export KEYSTONE_FEDERATION_CLIENT_SECRET=${KEYSTONE_FEDERATION_CLIENT_SECRET}
${1}: export KEYSTONE_CRYPTO_PASSPHRASE=${KEYSTONE_CRYPTO_PASSPHRASE}
${1}: export KEYSTONE_FEDERATION_CRYPTO_PASSPHRASE=${KEYSTONE_FEDERATION_CRYPTO_PASSPHRASE}
${1}: export LIBVIRT_SECRET=${LIBVIRT_SECRET}
${1}: export STORAGE_CLASS=${STORAGE_CLASS}
${1}: export OUT=${OUT}
Expand Down
8 changes: 4 additions & 4 deletions scripts/gen-input-kustomize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ if [ -z "$KEYSTONE_FEDERATION_CLIENT_SECRET" ]; then
echo "Please set KEYSTONE_FEDERATION_CLIENT_SECRET"; exit 1
fi

if [ -z "$KEYSTONE_CRYPTO_PASSPHRASE" ]; then
echo "Please set KEYSTONE_CRYPTO_PASSPHRASE"; exit 1
if [ -z "$KEYSTONE_FEDERATION_CRYPTO_PASSPHRASE" ]; then
echo "Please set KEYSTONE_FEDERATION_CRYPTO_PASSPHRASE"; exit 1
fi

if [ -z "$LIBVIRT_SECRET" ]; then
Expand Down Expand Up @@ -84,8 +84,8 @@ secretGenerator:
- CinderPassword=${PASSWORD}
- IronicPassword=${PASSWORD}
- IronicInspectorPassword=${PASSWORD}
- KeystoneClientSecret=${KEYSTONE_FEDERATION_CLIENT_SECRET}
- KeystoneCryptoPassphrase=${KEYSTONE_CRYPTO_PASSPHRASE}
- KeystoneOIDCClientSecret=${KEYSTONE_FEDERATION_CLIENT_SECRET}
- KeystoneOIDCCryptoPassphrase=${KEYSTONE_FEDERATION_CRYPTO_PASSPHRASE}
- OctaviaPassword=${PASSWORD}
- OctaviaHeartbeatKey=${PASSWORD}
- NovaPassword=${PASSWORD}
Expand Down