diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-04-08 15:14:33 +0000 |
|---|---|---|
| committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-04-08 15:14:33 +0000 |
| commit | 5aae293c3c63c26bb789f366bdc1c035722e0d95 (patch) | |
| tree | 5b65f57cbe22b4966aecbfd990e3a28080ea8837 | |
| parent | 4c2afb2c86759387f329dd06bdb50c59fe7e3532 (diff) | |
| download | definitions-5aae293c3c63c26bb789f366bdc1c035722e0d95.tar.gz | |
Remove multiple backends configuration - not required
| -rw-r--r-- | openstack/etc/cinder/cinder.conf | 9 | ||||
| -rw-r--r-- | openstack/usr/share/openstack/openstack-cinder-configure-backends | 8 |
2 files changed, 1 insertions, 16 deletions
diff --git a/openstack/etc/cinder/cinder.conf b/openstack/etc/cinder/cinder.conf index d27a541c..a7b26c54 100644 --- a/openstack/etc/cinder/cinder.conf +++ b/openstack/etc/cinder/cinder.conf @@ -619,7 +619,7 @@ auth_strategy=keystone # A list of backend names to use. These backend names should # be backed by a unique [CONFIG] group with its options (list # value) -enabled_backends=lvm_onenode +#enabled_backends=none # Whether snapshots count against GigaByte quota (boolean # value) @@ -2768,10 +2768,3 @@ admin_tenant_name=service # Private key file to use when starting the server securely # (string value) #key_file=<None> - -[lvm_onenode] -iscsi_helper=lioadm -volume_group=cinder-volumes -volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver -iscsi_ip_address=##GLANCE_HOST## -volume_backend_name=LVM_iSCSI diff --git a/openstack/usr/share/openstack/openstack-cinder-configure-backends b/openstack/usr/share/openstack/openstack-cinder-configure-backends index 1f2c3a2a..487c58c0 100644 --- a/openstack/usr/share/openstack/openstack-cinder-configure-backends +++ b/openstack/usr/share/openstack/openstack-cinder-configure-backends @@ -22,14 +22,6 @@ set -xe sed -i 's|# filter = \[ \"a\/\.\*\/\" \]|filter = \[ \"a\/sdb\/\", \"r\/\.\*\/\" \]|' \ /etc/lvm/lvm.conf -# Create the cinder LVM type and set a volume backend name -export OS_USERNAME=temporary_admin -export OS_PASSWORD=veryinsecure -export OS_TENANT_NAME=admin -export OS_AUTH_URL=http://localhost:35357/v2.0 -cinder type-create lvms -cinder type-key lvms set volume_backend_name=LVM_iSCSI - # Create initiatorname.iscsi file mkdir -p "$DESTDIR"/etc/iscsi echo "InitiatorName=$(iscsi-iname)" > /etc/iscsi/initiatorname.iscsi |