diff options
| -rw-r--r-- | compute-config.yaml | 7 | ||||
| -rw-r--r-- | compute.yaml | 27 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 7 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 27 | ||||
| -rw-r--r-- | overcloud-source.yaml | 21 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 26 |
6 files changed, 0 insertions, 115 deletions
diff --git a/compute-config.yaml b/compute-config.yaml index 4d1e3cec..5f075bd6 100644 --- a/compute-config.yaml +++ b/compute-config.yaml @@ -55,13 +55,6 @@ resources: host: {get_input: rabbit_host} username: {get_input: rabbit_username} password: {get_input: rabbit_password} - live-update: - host: {get_input: live_update_host} - username: {get_input: live_update_username} - password: {get_input: live_update_password} - tenant-name: {get_input: live_update_tenant_name} - base_image_id: {get_input: nova_image} - live_update_image_id: {get_input: live_update_compute_image} ntp: servers: - {server: {get_input: ntp_server}, fudge: "stratum 0"} diff --git a/compute.yaml b/compute.yaml index 57b30868..7024d25b 100644 --- a/compute.yaml +++ b/compute.yaml @@ -104,27 +104,6 @@ parameters: KeystoneHost: type: string default: '' - LiveUpdateComputeImage: - type: string - description: The image ID for live-updates to the overcloud compute nodes. - default: '' - LiveUpdateHost: - type: string - description: The IP address for the undercloud Glance API. - default: '' - LiveUpdatePassword: - type: string - default: '' - description: The live-update password for the undercloud Glance API. - hidden: true - LiveUpdateTenantName: - type: string - description: The live-update tenant name for the undercloud Glance API. - default: '' - LiveUpdateUserName: - type: string - description: The live-update username for the undercloud Glance API. - default: '' NeutronBridgeMappings: description: > The OVS logical->physical bridge mappings to use. See the Neutron @@ -287,12 +266,6 @@ resources: rabbit_host: {get_param: RabbitHost} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} - live_update_host: {get_param: LiveUpdateHost} - live_update_username: {get_param: LiveUpdateUserName} - live_update_password: {get_param: LiveUpdatePassword} - live_update_tenant_name: {get_param: LiveUpdateTenantName} - nova_image: {get_param: Image} - live_update_image_id: {get_param: LiveUpdateComputeImage} ntp_server: {get_param: NtpServer} NovaComputePassthrough: diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 8ba778bc..a7708a2e 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -56,13 +56,6 @@ resources: host: {get_input: rabbit_host} username: {get_input: rabbit_username} password: {get_input: rabbit_password} - live-update: - host: {get_input: live_update_host} - username: {get_input: live_update_username} - password: {get_input: live_update_password} - tenant-name: {get_input: live_update_tenant_name} - base_image_id: {get_input: nova_image} - live_update_image_id: {get_input: live_update_compute_image} ntp: servers: - {server: {get_input: ntp_server}, fudge: "stratum 0"} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 180657a6..1b73e812 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -91,27 +91,6 @@ parameters: default: default KeystoneHost: type: string - LiveUpdateComputeImage: - type: string - description: The image ID for live-updates to the overcloud compute nodes. - default: '' - LiveUpdateHost: - type: string - description: The IP address for the undercloud Glance API. - default: '' - LiveUpdatePassword: - type: string - default: '' - description: The live-update password for the undercloud Glance API. - hidden: true - LiveUpdateTenantName: - type: string - description: The live-update tenant name for the undercloud Glance API. - default: '' - LiveUpdateUserName: - type: string - description: The live-update username for the undercloud Glance API. - default: '' NeutronBridgeMappings: type: string NeutronDSN: @@ -267,12 +246,6 @@ resources: rabbit_host: {get_param: RabbitHost} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} - live_update_host: {get_param: LiveUpdateHost} - live_update_username: {get_param: LiveUpdateUserName} - live_update_password: {get_param: LiveUpdatePassword} - live_update_tenant_name: {get_param: LiveUpdateTenantName} - nova_image: {get_param: NovaImage} - live_update_image_id: {get_param: LiveUpdateComputeImage} ntp_server: {get_param: NtpServer} NovaCompute0AllNodesDeployment: depends_on: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index c08dcbde..a3252571 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -186,27 +186,6 @@ parameters: description: Keystone key for signing tokens. type: string hidden: true - LiveUpdateComputeImage: - type: string - description: The image ID for live-updates to the overcloud compute nodes. - default: '' - LiveUpdateHost: - type: string - description: The IP address for the undercloud Glance API. - default: '' - LiveUpdatePassword: - type: string - default: '' - description: The live-update password for the undercloud Glance API. - hidden: true - LiveUpdateTenantName: - type: string - description: The live-update tenant name for the undercloud Glance API. - default: '' - LiveUpdateUserName: - type: string - description: The live-update username for the undercloud Glance API. - default: '' MysqlInnodbBufferPoolSize: description: > Specifies the size of the buffer pool in megabytes. Setting to diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index e171ff82..54debcd6 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -356,27 +356,6 @@ parameters: default: 'eth0' description: What interface to add to the HypervisorNeutronPhysicalBridge. type: string - LiveUpdateComputeImage: - type: string - description: The image ID for live-updates to the overcloud compute nodes. - default: '' - LiveUpdateHost: - type: string - description: The IP address for the undercloud Glance API. - default: '' - LiveUpdatePassword: - type: string - default: '' - description: The live-update password for the undercloud Glance API. - hidden: true - LiveUpdateTenantName: - type: string - description: The live-update tenant name for the undercloud Glance API. - default: '' - LiveUpdateUserName: - type: string - description: The live-update username for the undercloud Glance API. - default: '' NeutronNetworkVLANRanges: default: 'datacentre' description: > @@ -516,11 +495,6 @@ resources: ImageUpdatePolicy: {get_param: ImageUpdatePolicy} KeyName: {get_param: KeyName} KeystoneHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - LiveUpdateComputeImage: {get_param: LiveUpdateComputeImage} - LiveUpdateHost: {get_param: LiveUpdateHost} - LiveUpdatePassword: {get_param: LiveUpdatePassword} - LiveUpdateTenantName: {get_param: LiveUpdateTenantName} - LiveUpdateUserName: {get_param: LiveUpdateUserName} NeutronBridgeMappings: {get_param: NeutronBridgeMappings} NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling} NeutronFlatNetworks: {get_param: NeutronFlatNetworks} |