diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-15 19:58:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-15 19:58:35 +0000 |
| commit | 50fcd42b3a120a0e02a41224f6278faf92746a8b (patch) | |
| tree | 80557434e7e6cba35743307abb76e42eb129f9ec | |
| parent | 5e2e52aceb02d8e12bd7ce86d99f208c4fb850d8 (diff) | |
| parent | 3af648f9df28eeb5ff83827860d90ae0735c00e9 (diff) | |
Merge "Remove unneeded neutron config parts from block-storage.yaml"
| -rw-r--r-- | block-storage.yaml | 16 |
1 files changed, 0 insertions, 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 |