From 3af648f9df28eeb5ff83827860d90ae0735c00e9 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 5 Aug 2014 18:28:45 +0200 Subject: Remove unneeded neutron config parts from block-storage.yaml Some of the keys defined in block-storage.yaml for neutron and passed to the BlockStorage nodes were related to neutron, but BlockStorage nodes do not route instances traffic so do not need to be deployed with the OVS agent. Change-Id: Icc7d5ea0d91370ccdf7cb4742d052fea004bae44 --- block-storage.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/block-storage.yaml b/block-storage.yaml index 22811d37..50577f48 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -8,12 +8,6 @@ parameters: default: baremetal description: Flavor for block storage nodes to request when deploying. type: string - NeutronNetworkType: - type: string - default: 'gre' - NeutronEnableTunnelling: - type: string - default: True resources: BlockStorage0: type: OS::Nova::Server @@ -31,7 +25,6 @@ resources: input_values: controller_host: {get_attr: [controller0, networks, ctlplane, 0]} cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} - neutron_local_ip: {get_attr: [BlockStorage0 , networks, ctlplane, 0]} signal_transport: NO_SIGNAL BlockStorageConfig: type: OS::Heat::StructuredConfig @@ -53,12 +46,3 @@ resources: host: {get_input: controller_host} username: {get_param: RabbitUserName} password: {get_param: RabbitPassword} - interfaces: - control: {get_param: NeutronPublicInterface} - neutron: - ovs: - local_ip: {get_input: neutron_local_ip} - tenant_network_type: {get_param: NeutronNetworkType} - enable_tunneling: {get_param: NeutronEnableTunnelling} - service-password: - get_param: NeutronPassword -- cgit 1.2.3-korg