Merge "Migrate to placement_service_password"

This commit is contained in:
Zuul 2019-05-15 21:54:57 +00:00 committed by Gerrit Code Review
commit 53e5d70cd7
2 changed files with 1 additions and 10 deletions

View File

@ -141,7 +141,6 @@ nova_oslomsg_rpc_password:
# Please also wire the appropriate userid in
# your user variables.
#nova_oslomsg_notify_password:
nova_placement_service_password:
# LXD Options for nova compute
lxd_trust_password:
@ -287,8 +286,5 @@ manila_profiler_hmac_key:
manila_service_password:
# Placement Options
# TODO(logan): Replace nova_placement_service_password with
# this var and add an upgrade playbook cleaning up the old
# var from user_secrets before releasing Train
# placement_service_password:
placement_service_password:
placement_galera_password:

View File

@ -22,8 +22,3 @@ placement_service_internalurl: "{{ placement_service_internaluri_proto }}://{{ i
placement_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(placement_service_proto) }}"
placement_service_adminurl: "{{ placement_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ placement_service_port }}"
placement_service_region: "{{ service_region }}"
# TODO(logan): Remove this before releasing Train after adding
# placement_service_password to user_secrets and cleaning up the old
# secret in an upgrade playbook
placement_service_password: "{{ nova_placement_service_password }}"