@@ -113,12 +113,12 @@ function deploy_seed() {
113113 run_kayobe seed host configure
114114}
115115
116- function deploy_seed_vault () {
117- # Deploy hashicorp vault to the seed
118- run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/vault -deploy-seed.yml
119- encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /vault /OS-TLS-INT.pem
120- encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /vault /seed-vault -keys.json
121- encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /vault /* .key
116+ function deploy_seed_openbao () {
117+ # Deploy OpenBao to the seed
118+ run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/openbao -deploy-seed.yml
119+ encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /openbao /OS-TLS-INT.pem
120+ encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /openbao /seed-openbao -keys.json
121+ encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /openbao /* .key
122122}
123123
124124function get_seed_ssh() {
@@ -130,15 +130,15 @@ function get_seed_ssh() {
130130}
131131
132132function copy_ca_to_seed() {
133- # Add the Vault CA to the trust store on the seed.
133+ # Add the OpenBao CA to the trust store on the seed.
134134 seed_ssh=$( get_seed_ssh)
135135
136- scp -oStrictHostKeyChecking=no $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/certificates/ca/vault .crt ${seed_ssh} :
136+ scp -oStrictHostKeyChecking=no $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/certificates/ca/openbao .crt ${seed_ssh} :
137137 if [[ $( grep ' ^ID=' /etc/os-release | cut -d= -f2) == " ubuntu" ]]; then
138- ssh -oStrictHostKeyChecking=no ${seed_ssh} sudo cp vault .crt /usr/local/share/ca-certificates/OS-TLS-ROOT.crt
138+ ssh -oStrictHostKeyChecking=no ${seed_ssh} sudo cp openbao .crt /usr/local/share/ca-certificates/OS-TLS-ROOT.crt
139139 ssh -oStrictHostKeyChecking=no ${seed_ssh} sudo update-ca-certificates
140140 else
141- ssh -oStrictHostKeyChecking=no ${seed_ssh} sudo cp vault .crt /etc/pki/ca-trust/source/anchors/OS-TLS-ROOT.crt
141+ ssh -oStrictHostKeyChecking=no ${seed_ssh} sudo cp openbao .crt /etc/pki/ca-trust/source/anchors/OS-TLS-ROOT.crt
142142 ssh -oStrictHostKeyChecking=no ${seed_ssh} sudo update-ca-trust
143143 fi
144144}
@@ -150,31 +150,31 @@ function deploy_ceph() {
150150 run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/cephadm-gather-keys.yml
151151}
152152
153- function deploy_overcloud_vault () {
153+ function deploy_overcloud_openbao () {
154154 # NOTE: Previously it was necessary to first deploy HAProxy with TLS disabled.
155155 if [[ -f $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/globals-tls-config.yml ]]; then
156156 # Skip os_capacity deployment since it requires admin-openrc.sh which doesn't exist yet.
157157 run_kayobe overcloud service deploy --skip-tags os_capacity -kt haproxy
158158 fi
159159
160- # Deploy hashicorp vault to the controllers
161- run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/vault -deploy-overcloud.yml
162- encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /vault /overcloud-vault -keys.json
160+ # Deploy OpenBao to the controllers
161+ run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/openbao -deploy-overcloud.yml
162+ encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /openbao /overcloud-openbao -keys.json
163163}
164164
165165function generate_overcloud_certs() {
166166 # Generate external tls certificates
167- if [[ -f $KAYOBE_CONFIG_PATH /ansible/vault -generate-test-external-tls.yml ]]; then
168- run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/vault -generate-test-external-tls.yml
167+ if [[ -f $KAYOBE_CONFIG_PATH /ansible/openbao -generate-test-external-tls.yml ]]; then
168+ run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/openbao -generate-test-external-tls.yml
169169 encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/certificates/haproxy.pem
170170 fi
171171
172172 # Generate internal tls certificates
173- run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/vault -generate-internal-tls.yml
173+ run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/openbao -generate-internal-tls.yml
174174 encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/certificates/haproxy-internal.pem
175175
176176 # Generate backend tls certificates
177- run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/vault -generate-backend-tls.yml
177+ run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/openbao -generate-backend-tls.yml
178178 for cert in $( ls -1 $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/certificates/* -key.pem) ; do
179179 encrypt_file $cert
180180 done
@@ -192,11 +192,11 @@ function generate_overcloud_certs() {
192192}
193193
194194function generate_barbican_secrets() {
195- # Create vault configuration for barbican
195+ # Create OpenBao configuration for barbican
196196 decrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /secrets.yml
197197 sed -i " s/secret_id:.*/secret_id: $( uuidgen) /g" $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /secrets.yml
198198 encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /secrets.yml
199- run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/vault -deploy-barbican.yml
199+ run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/openbao -deploy-barbican.yml
200200 decrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /secrets.yml
201201 sed -i " s/role_id:.*/role_id: $( cat /tmp/barbican-role-id) /g" $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /secrets.yml
202202 encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /secrets.yml
@@ -208,9 +208,9 @@ function deploy_overcloud() {
208208
209209 deploy_ceph
210210
211- deploy_seed_vault
211+ deploy_seed_openbao
212212
213- deploy_overcloud_vault
213+ deploy_overcloud_openbao
214214
215215 generate_overcloud_certs
216216
@@ -354,8 +354,8 @@ function deploy_full() {
354354
355355function upgrade_overcloud() {
356356 # Generate external tls certificates if it was previously disabled.
357- if [[ -f $KAYOBE_CONFIG_PATH /ansible/vault -generate-test-external-tls.yml ]] && [[ ! -f $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/certificates/haproxy.pem ]]; then
358- run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/vault -generate-test-external-tls.yml
357+ if [[ -f $KAYOBE_CONFIG_PATH /ansible/openbao -generate-test-external-tls.yml ]] && [[ ! -f $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/certificates/haproxy.pem ]]; then
358+ run_kayobe playbook run $KAYOBE_CONFIG_PATH /ansible/openbao -generate-test-external-tls.yml
359359 encrypt_file $KAYOBE_CONFIG_PATH /environments/$KAYOBE_ENVIRONMENT /kolla/certificates/haproxy.pem
360360 fi
361361
0 commit comments