diff options
| -rw-r--r-- | compute-config.yaml | 1 | ||||
| -rw-r--r-- | compute.yaml | 6 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 2 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 6 | ||||
| -rw-r--r-- | overcloud-source.yaml | 14 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 14 |
6 files changed, 2 insertions, 41 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..c0a69afe 100644 --- a/compute.yaml +++ b/compute.yaml @@ -113,8 +113,6 @@ parameters: scripts or be sure to keep 'datacentre' as a mapping network name. type: string default: "" - NeutronDSN: - type: string NeutronEnableTunnelling: type: string default: "True" @@ -195,8 +193,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 +268,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} @@ -288,7 +283,6 @@ resources: keystone_host: {get_param: KeystoneHost} neutron_flat_networks: {get_param: NeutronFlatNetworks} neutron_host: {get_param: NeutronHost} - neutron_dsn: {get_param: NeutronDSN} neutron_local_ip: {get_attr: [NovaCompute, networks, ctlplane, 0]} neutron_tenant_network_type: {get_param: NeutronNetworkType} neutron_tunnel_types: {get_param: NeutronTunnelTypes} diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index a7708a2e..2d8168c0 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} @@ -36,7 +35,6 @@ resources: host: {get_input: neutron_host} router_distributed: {get_input: neutron_router_distributed} agent_mode: {get_input: neutron_agent_mode} - ovs_db: {get_input: neutron_dsn} metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret} mechanism_drivers: {get_input: neutron_mechanism_drivers} allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 2d8168a8..639d971e 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -93,8 +93,6 @@ parameters: type: string NeutronBridgeMappings: type: string - NeutronDSN: - type: string NeutronEnableTunnelling: type: string NeutronFlatNetworks: @@ -153,8 +151,6 @@ parameters: NovaComputeLibvirtType: type: string default: '' - NovaDSN: - type: string NovaImage: type: string default: overcloud-compute @@ -211,7 +207,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} @@ -227,7 +222,6 @@ resources: keystone_host: {get_param: KeystoneHost} neutron_flat_networks: {get_param: NeutronFlatNetworks} neutron_host: {get_param: NeutronHost} - neutron_dsn: {get_param: NeutronDSN} neutron_local_ip: {get_attr: [NovaCompute0, networks, ctlplane, 0]} neutron_tenant_network_type: {get_param: NeutronNetworkType} neutron_tunnel_types: {get_param: NeutronTunnelTypes} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index d1f5ce99..d62a0939 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -422,25 +422,13 @@ 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: - - '' - - - mysql://neutron:unset@ - - *compute_database_host - - /ovs_neutron NeutronNetworkType: get_param: NeutronNetworkType NeutronTunnelTypes: diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 094332e2..803a5016 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -577,24 +577,12 @@ 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: - - '' - - - mysql://neutron:unset@ - - *compute_database_host - - /ovs_neutron BlockStorage: type: OS::Heat::ResourceGroup |