diff options
| -rw-r--r-- | compute-config.yaml | 1 | ||||
| -rw-r--r-- | compute.yaml | 3 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 1 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 3 | ||||
| -rw-r--r-- | overcloud-source.yaml | 8 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 8 |
6 files changed, 2 insertions, 22 deletions
diff --git a/compute-config.yaml b/compute-config.yaml index a5bfab34..45bb8e1e 100644 --- a/compute-config.yaml +++ b/compute-config.yaml @@ -12,7 +12,6 @@ resources: nova: compute_driver: { get_input: nova_compute_driver } compute_libvirt_type: { get_input: nova_compute_libvirt_type } - db: {get_input: nova_dsn} debug: {get_input: debug} host: {get_input: nova_api_host} public_ip: {get_input: nova_public_ip} diff --git a/compute.yaml b/compute.yaml index 145b61c3..82698751 100644 --- a/compute.yaml +++ b/compute.yaml @@ -195,8 +195,6 @@ parameters: NovaComputeLibvirtType: type: string default: '' - NovaDSN: - type: string NovaPassword: default: unset description: The password for the nova service account, used by nova-api. @@ -272,7 +270,6 @@ resources: debug: {get_param: Debug} nova_compute_driver: {get_param: NovaComputeDriver} nova_compute_libvirt_type: {get_param: NovaComputeLibvirtType} - nova_dsn: {get_param: NovaDSN} nova_public_ip: {get_param: NovaPublicIP} nova_api_host: {get_param: NovaApiHost} nova_password: {get_param: NovaPassword} diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index a7708a2e..b3ef6000 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -7,7 +7,6 @@ resources: nova: compute_driver: { get_input: nova_compute_driver } compute_libvirt_type: { get_input: nova_compute_libvirt_type } - db: {get_input: nova_dsn} debug: {get_param: Debug} host: {get_input: nova_api_host} public_ip: {get_input: nova_public_ip} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 2d8168a8..9a9f40db 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -153,8 +153,6 @@ parameters: NovaComputeLibvirtType: type: string default: '' - NovaDSN: - type: string NovaImage: type: string default: overcloud-compute @@ -211,7 +209,6 @@ resources: input_values: nova_compute_driver: {get_param: NovaComputeDriver} nova_compute_libvirt_type: {get_param: NovaComputeLibvirtType} - nova_dsn: {get_param: NovaDSN} nova_public_ip: {get_param: NovaPublicIP} nova_api_host: {get_param: NovaApiHost} nova_password: {get_param: NovaPassword} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 66c782cd..ba41bcb8 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -418,18 +418,12 @@ resources: NeutronHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - NovaDSN: - Fn::Join: - - '' - - - mysql://nova:unset@ - - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - - /nova NovaPublicIP: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]} CeilometerDSN: Fn::Join: - '' - - mysql://ceilometer:unset@ - - *compute_database_host + - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - /ceilometer NeutronDSN: Fn::Join: diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 094332e2..a9f49719 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -577,17 +577,11 @@ resources: RabbitUserName: {get_param: RabbitUserName} SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName} SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword} - NovaDSN: - list_join: - - '' - - - mysql://nova:unset@ - - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - - /nova CeilometerDSN: list_join: - '' - - mysql://ceilometer:unset@ - - *compute_database_host + - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - /ceilometer NeutronDSN: list_join: |