aboutsummaryrefslogtreecommitdiffstats
path: root/undercloud-vm-ironic-config.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-03 13:57:43 +0000
committerGerrit Code Review <review@openstack.org>2015-06-03 13:57:43 +0000
commitebb48a23fb23c6c7ad3701f52b62e6dd8af3b230 (patch)
tree85235f5db4f1e795fb61c76d4f4e3a98e0c05736 /undercloud-vm-ironic-config.yaml
parenteaa5eb6a5985c52b484d58e22075b84caf2f2493 (diff)
parentf5c903c89636512a9bd14cf62b00850cab760104 (diff)
Merge "Reuse the undercloud service passwords as db passwords."
Diffstat (limited to 'undercloud-vm-ironic-config.yaml')
-rw-r--r--undercloud-vm-ironic-config.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/undercloud-vm-ironic-config.yaml b/undercloud-vm-ironic-config.yaml
index f5aa4981..cc0dafb6 100644
--- a/undercloud-vm-ironic-config.yaml
+++ b/undercloud-vm-ironic-config.yaml
@@ -8,7 +8,7 @@ resources:
compute_driver: {get_param: NovaComputeDriver}
compute_manager: {get_param: NovaComputeManager}
scheduler_host_manager: {get_param: NovaSchedulerHostManager}
- db: mysql://nova:unset@localhost/nova
+ db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova']]}
debug: {get_param: Debug}
default_ephemeral_format: ext4
host: 127.0.0.1
@@ -22,6 +22,6 @@ resources:
properties:
config:
ironic:
- db: mysql://ironic:unset@localhost/ironic
+ db: {list_join: ['', ['mysql://ironic:', {get_param: IronicPassword}, '@localhost/ironic']]}
service-password: {get_input: ironic_service_password}
virtual_power_ssh_key: {get_input: virtual_power_ssh_key}