From ff60bd02950a366c0f8ee0047b1562cfea88201e Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 5 Aug 2014 18:11:26 +0200 Subject: Remove duplicate config section from block-storage.yaml Deletes a duplicate config section from file block-storage.yaml (and a duplicate admin-password key too). Change-Id: I226517ea467751d00dbf217a6b6e4e0839538225 --- block-storage.yaml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/block-storage.yaml b/block-storage.yaml index 3e5f460b..761de523 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -49,7 +49,6 @@ resources: get_param: CinderPassword iscsi-helper: get_param: CinderISCSIHelper - admin-password: {get_param: AdminPassword} rabbit: host: {get_input: controller_host} username: {get_param: RabbitUserName} @@ -63,28 +62,3 @@ resources: enable_tunneling: {get_param: NeutronEnableTunnelling} service-password: get_param: NeutronPassword - config: - keystone: - host: {get_input: controller_host} - cinder: - db: {get_input: cinder_dsn} - volume_size_mb: - get_param: CinderLVMLoopDeviceSize - service-password: - get_param: CinderPassword - iscsi-helper: - get_param: CinderISCSIHelper - admin-password: {get_param: AdminPassword} - rabbit: - 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