openstack
/
instack-undercloud
Code Issues Proposed changes

Delete not existent cinder params 

Cinder params regarding Neutron has been deleted from
block-storage.yaml template. We should not set them,
otherwise Tuskar throws an error.
This commit is contained in:
Ladislav Smola 2014-12-11 16:49:16 +01:00
parent ffb528c169
commit 7221bfe89c
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/instack-deploy-overcloud
View File

@ -107,7 +107,6 @@ if [ -n "$TUSKAR" ]; then
-A controller-1::HeatPassword=${OVERCLOUD_HEAT_PASSWORD}
-A controller-1::NeutronPassword=${OVERCLOUD_NEUTRON_PASSWORD}
-A compute-1::NeutronPassword=${OVERCLOUD_NEUTRON_PASSWORD}
-A cinder-storage-1::NeutronPassword=${OVERCLOUD_NEUTRON_PASSWORD}
-A controller-1::NovaPassword=${OVERCLOUD_NOVA_PASSWORD}
-A compute-1::NovaPassword=${OVERCLOUD_NOVA_PASSWORD}
-A controller-1::SwiftHashSuffix=${OVERCLOUD_SWIFT_HASH}
@ -117,13 +116,11 @@ if [ -n "$TUSKAR" ]; then
-A controller-1::CloudName=overcloud
-A controller-1::NeutronPublicInterface=$NeutronPublicInterface
-A compute-1::NeutronPublicInterface=$NeutronPublicInterface
-A cinder-storage-1::NeutronPublicInterface=$NeutronPublicInterface
-A compute-1::NovaComputeLibvirtType=$OVERCLOUD_LIBVIRT_TYPE
-A controller-1::NtpServer=${NtpServer}
-A compute-1::NtpServer=${NtpServer}
-A controller-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
-A compute-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
-A cinder-storage-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
-A swift-storage-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
-A controller-1::NeutronTunnelTypes=${NEUTRON_TUNNEL_TYPES}
-A compute-1::NeutronTunnelTypes=${NEUTRON_TUNNEL_TYPES}

3
scripts/instack-update-overcloud
View File

@ -106,7 +106,6 @@ if [ -n "$TUSKAR" ]; then
-A controller-1::HeatPassword=${OVERCLOUD_HEAT_PASSWORD}
-A controller-1::NeutronPassword=${OVERCLOUD_NEUTRON_PASSWORD}
-A compute-1::NeutronPassword=${OVERCLOUD_NEUTRON_PASSWORD}
-A cinder-storage-1::NeutronPassword=${OVERCLOUD_NEUTRON_PASSWORD}
-A controller-1::NovaPassword=${OVERCLOUD_NOVA_PASSWORD}
-A compute-1::NovaPassword=${OVERCLOUD_NOVA_PASSWORD}
-A controller-1::SwiftHashSuffix=${OVERCLOUD_SWIFT_HASH}
@ -116,13 +115,11 @@ if [ -n "$TUSKAR" ]; then
-A controller-1::CloudName=overcloud
-A controller-1::NeutronPublicInterface=$NeutronPublicInterface
-A compute-1::NeutronPublicInterface=$NeutronPublicInterface
-A cinder-storage-1::NeutronPublicInterface=$NeutronPublicInterface
-A compute-1::NovaComputeLibvirtType=$OVERCLOUD_LIBVIRT_TYPE
-A controller-1::NtpServer=${NtpServer}
-A compute-1::NtpServer=${NtpServer}
-A controller-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
-A compute-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
-A cinder-storage-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
-A swift-storage-1::NeutronNetworkType=${NEUTRON_NETWORK_TYPE}
-A controller-1::NeutronTunnelTypes=${NEUTRON_TUNNEL_TYPES}
-A compute-1::NeutronTunnelTypes=${NEUTRON_TUNNEL_TYPES}