Merge "Reuse the undercloud service passwords as db passwords."
This commit is contained in:
commit
ebb48a23fb
|
@ -8,7 +8,7 @@ resources:
|
||||||
compute_driver: {get_param: NovaComputeDriver}
|
compute_driver: {get_param: NovaComputeDriver}
|
||||||
compute_manager: {get_param: NovaComputeManager}
|
compute_manager: {get_param: NovaComputeManager}
|
||||||
scheduler_host_manager: {get_param: NovaSchedulerHostManager}
|
scheduler_host_manager: {get_param: NovaSchedulerHostManager}
|
||||||
db: mysql://nova:unset@localhost/nova
|
db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova']]}
|
||||||
default_ephemeral_format: ext4
|
default_ephemeral_format: ext4
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
metadata-proxy: false
|
metadata-proxy: false
|
||||||
|
@ -17,7 +17,7 @@ resources:
|
||||||
reserved_host_memory_mb: 0
|
reserved_host_memory_mb: 0
|
||||||
baremetal:
|
baremetal:
|
||||||
arch: {get_input: nova_arch}
|
arch: {get_input: nova_arch}
|
||||||
db: mysql://nova:unset@localhost/nova_bm
|
db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova_bm']]}
|
||||||
power_manager: {get_input: power_manager}
|
power_manager: {get_input: power_manager}
|
||||||
pxe_deploy_timeout: {get_input: pxe_deploy_timeout}
|
pxe_deploy_timeout: {get_input: pxe_deploy_timeout}
|
||||||
service-password: {get_input: nova_service_password}
|
service-password: {get_input: nova_service_password}
|
||||||
|
|
|
@ -260,7 +260,7 @@ resources:
|
||||||
recheck_interval : 5
|
recheck_interval : 5
|
||||||
quorum_policy : ignore
|
quorum_policy : ignore
|
||||||
ceilometer:
|
ceilometer:
|
||||||
db: mysql://ceilometer:unset@localhost/ceilometer
|
db: {list_join: ['', ['mysql://ceilometer:', {get_param: CeilometerPassword}, '@localhost/ceilometer']]}
|
||||||
debug: {get_param: Debug}
|
debug: {get_param: Debug}
|
||||||
metering_secret: {get_param: CeilometerMeteringSecret}
|
metering_secret: {get_param: CeilometerMeteringSecret}
|
||||||
snmpd_readonly_user_name:
|
snmpd_readonly_user_name:
|
||||||
|
@ -272,7 +272,7 @@ resources:
|
||||||
db-password: unset
|
db-password: unset
|
||||||
glance:
|
glance:
|
||||||
backend: file
|
backend: file
|
||||||
db: mysql://glance:unset@localhost/glance
|
db: {list_join: ['', ['mysql://glance:', {get_param: GlancePassword}, '@localhost/glance']]}
|
||||||
debug: {get_param: Debug}
|
debug: {get_param: Debug}
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
port:
|
port:
|
||||||
|
@ -291,14 +291,14 @@ resources:
|
||||||
admin_tenant_name: service
|
admin_tenant_name: service
|
||||||
admin_user: heat
|
admin_user: heat
|
||||||
auth_encryption_key: unset___________
|
auth_encryption_key: unset___________
|
||||||
db: mysql://heat:unset@localhost/heat
|
db: {list_join: ['', ['mysql://heat:', {get_param: HeatPassword}, '@localhost/heat']]}
|
||||||
debug: {get_param: Debug}
|
debug: {get_param: Debug}
|
||||||
stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword}
|
stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword}
|
||||||
watch_server_url: {get_input: heat.watch_server_url}
|
watch_server_url: {get_input: heat.watch_server_url}
|
||||||
metadata_server_url: {get_input: heat.metadata_server_url}
|
metadata_server_url: {get_input: heat.metadata_server_url}
|
||||||
waitcondition_server_url: {get_input: heat.waitcondition_server_url}
|
waitcondition_server_url: {get_input: heat.waitcondition_server_url}
|
||||||
keystone:
|
keystone:
|
||||||
db: mysql://keystone:unset@localhost/keystone
|
db: {list_join: ['', ['mysql://keystone:', {get_param: AdminToken}, '@localhost/keystone']]}
|
||||||
debug: {get_param: Debug}
|
debug: {get_param: Debug}
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
ca_certificate: {get_param: KeystoneCACertificate}
|
ca_certificate: {get_param: KeystoneCACertificate}
|
||||||
|
@ -314,7 +314,7 @@ resources:
|
||||||
neutron:
|
neutron:
|
||||||
debug: {get_param: Debug}
|
debug: {get_param: Debug}
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
|
ovs_db: {list_join: ['', ['mysql://neutron:', {get_param: NeutronPassword}, '@localhost/ovs_neutron?charset=utf8']]}
|
||||||
ovs:
|
ovs:
|
||||||
local_ip:
|
local_ip:
|
||||||
get_input: controller_host
|
get_input: controller_host
|
||||||
|
|
|
@ -8,7 +8,7 @@ resources:
|
||||||
compute_driver: {get_param: NovaComputeDriver}
|
compute_driver: {get_param: NovaComputeDriver}
|
||||||
compute_manager: {get_param: NovaComputeManager}
|
compute_manager: {get_param: NovaComputeManager}
|
||||||
scheduler_host_manager: {get_param: NovaSchedulerHostManager}
|
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}
|
debug: {get_param: Debug}
|
||||||
default_ephemeral_format: ext4
|
default_ephemeral_format: ext4
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
|
@ -22,6 +22,6 @@ resources:
|
||||||
properties:
|
properties:
|
||||||
config:
|
config:
|
||||||
ironic:
|
ironic:
|
||||||
db: mysql://ironic:unset@localhost/ironic
|
db: {list_join: ['', ['mysql://ironic:', {get_param: IronicPassword}, '@localhost/ironic']]}
|
||||||
service-password: {get_input: ironic_service_password}
|
service-password: {get_input: ironic_service_password}
|
||||||
virtual_power_ssh_key: {get_input: virtual_power_ssh_key}
|
virtual_power_ssh_key: {get_input: virtual_power_ssh_key}
|
||||||
|
|
|
@ -8,7 +8,7 @@ resources:
|
||||||
compute_driver: {get_param: NovaComputeDriver}
|
compute_driver: {get_param: NovaComputeDriver}
|
||||||
compute_manager: {get_param: NovaComputeManager}
|
compute_manager: {get_param: NovaComputeManager}
|
||||||
scheduler_host_manager: {get_param: NovaSchedulerHostManager}
|
scheduler_host_manager: {get_param: NovaSchedulerHostManager}
|
||||||
db: mysql://nova:unset@localhost/nova
|
db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova']]}
|
||||||
default_ephemeral_format: ext4
|
default_ephemeral_format: ext4
|
||||||
host: 127.0.0.1
|
host: 127.0.0.1
|
||||||
metadata-proxy: false
|
metadata-proxy: false
|
||||||
|
@ -17,7 +17,7 @@ resources:
|
||||||
reserved_host_memory_mb: 0
|
reserved_host_memory_mb: 0
|
||||||
baremetal:
|
baremetal:
|
||||||
arch: {get_input: nova_arch}
|
arch: {get_input: nova_arch}
|
||||||
db: mysql://nova:unset@localhost/nova_bm
|
db: {list_join: ['', ['mysql://nova:', {get_param: NovaPassword}, '@localhost/nova_bm']]}
|
||||||
power_manager: {get_input: power_manager}
|
power_manager: {get_input: power_manager}
|
||||||
pxe_deploy_timeout: {get_input: pxe_deploy_timeout}
|
pxe_deploy_timeout: {get_input: pxe_deploy_timeout}
|
||||||
virtual_power:
|
virtual_power:
|
||||||
|
|
Loading…
Reference in New Issue