diff options
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/cinder/defaults/main.yml | 13 | ||||
| -rw-r--r-- | ansible/roles/cinder/tasks/config.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/cinder/tasks/precheck.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/cinder/templates/cinder.conf.j2 | 13 | ||||
| -rw-r--r-- | doc/source/reference/storage/cinder-guide-hnas.rst | 210 | ||||
| -rw-r--r-- | doc/source/reference/storage/cinder-guide.rst | 4 | ||||
| -rw-r--r-- | doc/source/reference/storage/index.rst | 1 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 1 |
9 files changed, 1 insertions, 245 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index a212005d8..1ba1ef5ca 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -850,7 +850,6 @@ enable_ceph_rgw: "no" enable_ceph_rgw_loadbalancer: "{{ enable_ceph_rgw | bool }}" enable_cinder: "no" enable_cinder_backup: "yes" -enable_cinder_backend_hnas_nfs: "no" enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool }}" enable_cinder_backend_lvm: "no" enable_cinder_backend_nfs: "no" diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index 53d38daa3..9425fc773 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/ansible/roles/cinder/defaults/main.yml @@ -236,8 +236,6 @@ cinder_backends: enabled: "{{ enable_cinder_backend_lvm | bool }}" - name: "{{ cinder_backend_nfs_name }}" enabled: "{{ enable_cinder_backend_nfs | bool }}" - - name: "{{ cinder_backend_hnas_nfs_name }}" - enabled: "{{ enable_cinder_backend_hnas_nfs | bool }}" - name: "{{ cinder_backend_vmwarevc_vmdk_name }}" enabled: "{{ cinder_backend_vmwarevc_vmdk | bool }}" - name: "{{ cinder_backend_vmware_vstorage_object_name }}" @@ -256,7 +254,6 @@ cinder_backends: cinder_backend_ceph_name: "rbd-1" cinder_backend_lvm_name: "lvm-1" cinder_backend_nfs_name: "nfs-1" -cinder_backend_hnas_nfs_name: "hnas-nfs" cinder_backend_vmwarevc_vmdk_name: "vmwarevc-vmdk" cinder_backend_vmware_vstorage_object_name: "vmware-vstorage-object" cinder_backend_quobyte_name: "QuobyteHD" @@ -286,16 +283,6 @@ cinder_notification_topics: cinder_enabled_notification_topics: "{{ cinder_notification_topics | selectattr('enabled', 'equalto', true) | list }}" -################################## -# Hitachi NAS Platform NFS drivers -################################## -# nfs -hnas_nfs_backend: "hnas_nfs_backend" -hnas_nfs_username: -hnas_nfs_mgmt_ip0: -hnas_nfs_svc0_volume_type: -hnas_nfs_svc0_hdp: - ######################### # Quobyte Storage Driver ######################### diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml index 44bade070..47adebb54 100644 --- a/ansible/roles/cinder/tasks/config.yml +++ b/ansible/roles/cinder/tasks/config.yml @@ -130,7 +130,7 @@ - "{{ node_custom_config }}/cinder/nfs_shares" - "{{ node_custom_config }}/cinder/cinder-volume/nfs_shares" - "{{ node_custom_config }}/cinder/{{ inventory_hostname }}/nfs_shares" - skip: "{{ not enable_cinder_backend_nfs | bool and not enable_cinder_backend_hnas_nfs | bool }}" + skip: "{{ not enable_cinder_backend_nfs | bool }}" when: service | service_enabled_and_mapped_to_host notify: - Restart cinder-volume container diff --git a/ansible/roles/cinder/tasks/precheck.yml b/ansible/roles/cinder/tasks/precheck.yml index c29ab8f88..8d5f51f05 100644 --- a/ansible/roles/cinder/tasks/precheck.yml +++ b/ansible/roles/cinder/tasks/precheck.yml @@ -32,7 +32,6 @@ msg: "Please enable at least one backend when enabling Cinder" when: - not skip_cinder_backend_check | bool - - not enable_cinder_backend_hnas_nfs | bool - not enable_cinder_backend_iscsi | bool - not enable_cinder_backend_lvm | bool - not enable_cinder_backend_nfs | bool diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 41ca817b8..1920c3915 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -174,19 +174,6 @@ nas_secure_file_permissions = False nas_secure_file_operations = False {% endif %} -{% if enable_cinder_backend_hnas_nfs | bool %} -[{{ cinder_backend_hnas_nfs_name }}] -volume_driver = cinder.volume.drivers.hitachi.hnas_nfs.HNASNFSDriver -nfs_shares_config = /home/cinder/nfs_shares -volume_backend_name = {{ hnas_nfs_backend }} -hnas_username = {{ hnas_nfs_username }} -hnas_password = {{ hnas_nfs_password }} -hnas_mgmt_ip0 = {{ hnas_nfs_mgmt_ip0 }} - -hnas_svc0_volume_type = {{ hnas_nfs_svc0_volume_type }} -hnas_svc0_hdp = {{ hnas_nfs_svc0_hdp }} -{% endif %} - {% if cinder_backend_vmwarevc_vmdk | bool %} [{{ cinder_backend_vmwarevc_vmdk_name }}] volume_driver = cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver diff --git a/doc/source/reference/storage/cinder-guide-hnas.rst b/doc/source/reference/storage/cinder-guide-hnas.rst deleted file mode 100644 index 3c92a9831..000000000 --- a/doc/source/reference/storage/cinder-guide-hnas.rst +++ /dev/null @@ -1,210 +0,0 @@ -.. _cinder-guide-hnas: - -======================================================== -Hitachi NAS Platform iSCSI and NFS drives for OpenStack -======================================================== - -Overview -~~~~~~~~ - -The Block Storage service provides persistent block storage resources that -Compute instances can consume. This includes secondary attached storage similar -to the Amazon Elastic Block Storage (EBS) offering. In addition, you can write -images to a Block Storage device for Compute to use as a bootable persistent -instance. - -Requirements ------------- - -- Hitachi NAS Platform Models 3080, 3090, 4040, 4060, 4080, and 4100. - -- HNAS/SMU software version is 12.2 or higher. - -- HNAS configuration and management utilities to create a storage pool (span) - and an EVS. - - - GUI (SMU). - - - SSC CLI. - -- You must set an iSCSI domain to EVS - -Supported shared file systems and operations --------------------------------------------- - -The NFS and iSCSI drivers support these operations: - -- Create, delete, attach, and detach volumes. - -- Create, list, and delete volume snapshots. - -- Create a volume from a snapshot. - -- Copy an image to a volume. - -- Copy a volume to an image. - -- Clone a volume. - -- Extend a volume. - -- Get volume statistics. - -- Manage and unmanage a volume. - -- Manage and unmanage snapshots (HNAS NFS only). - -Configuration example for Hitachi NAS Platform NFS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -NFS backend ------------ - -Enable cinder hnas backend nfs in ``/etc/kolla/globals.yml`` - -.. code-block:: yaml - - enable_cinder_backend_hnas_nfs: "yes" - -Create or modify the file ``/etc/kolla/config/cinder.conf`` and -add the contents: - -.. path /etc/kolla/config/cinder.conf -.. code-block:: ini - - [DEFAULT] - enabled_backends = hnas-nfs - - [hnas-nfs] - volume_driver = cinder.volume.drivers.hitachi.hnas_nfs.HNASNFSDriver - volume_nfs_backend = hnas_nfs_backend - hnas_nfs_username = supervisor - hnas_nfs_mgmt_ip0 = <hnas_ip> - hnas_chap_enabled = True - - hnas_nfs_svc0_volume_type = nfs_gold - hnas_nfs_svc0_hdp = <svc0_ip>/<export_name> - -Then set password for the backend in ``/etc/kolla/passwords.yml``: - -.. code-block:: yaml - - hnas_nfs_password: supervisor - -Configuration on Kolla deployment ---------------------------------- - -Enable Shared File Systems service and HNAS driver in -``/etc/kolla/globals.yml`` - -.. code-block:: yaml - - enable_cinder: "yes" - -Configuration on HNAS ---------------------- - -Create the data HNAS network in Kolla OpenStack: - -List the available tenants: - -.. code-block:: console - - openstack project list - -Create a network to the given tenant (service), providing the tenant ID, -a name for the network, the name of the physical network over which the -virtual network is implemented, and the type of the physical mechanism by -which the virtual network is implemented: - -.. code-block:: console - - neutron net-create --tenant-id <SERVICE_ID> hnas_network \ - --provider:physical_network=physnet2 --provider:network_type=flat - -Create a subnet to the same tenant (service), the gateway IP of this subnet, -a name for the subnet, the network ID created before, and the CIDR of -subnet: - -.. code-block:: console - - neutron subnet-create --tenant-id <SERVICE_ID> --gateway <GATEWAY> \ - --name hnas_subnet <NETWORK_ID> <SUBNET_CIDR> - -Add the subnet interface to a router, providing the router ID and subnet -ID created before: - -.. code-block:: console - - neutron router-interface-add <ROUTER_ID> <SUBNET_ID> - -Create volume -~~~~~~~~~~~~~ - -Create a non-bootable volume. - -.. code-block:: console - - openstack volume create --size 1 my-volume - -Verify Operation. - -.. code-block:: console - - cinder show my-volume - - +--------------------------------+--------------------------------------+ - | Property | Value | - +--------------------------------+--------------------------------------+ - | attachments | [] | - | availability_zone | nova | - | bootable | false | - | consistencygroup_id | None | - | created_at | 2017-01-17T19:02:45.000000 | - | description | None | - | encrypted | False | - | id | 4f5b8ae8-9781-411e-8ced-de616ae64cfd | - | metadata | {} | - | migration_status | None | - | multiattach | False | - | name | my-volume | - | os-vol-host-attr:host | compute@hnas-iscsi#iscsi_gold | - | os-vol-mig-status-attr:migstat | None | - | os-vol-mig-status-attr:name_id | None | - | os-vol-tenant-attr:tenant_id | 16def9176bc64bd283d419ac2651e299 | - | replication_status | disabled | - | size | 1 | - | snapshot_id | None | - | source_volid | None | - | status | available | - | updated_at | 2017-01-17T19:02:46.000000 | - | user_id | fb318b96929c41c6949360c4ccdbf8c0 | - | volume_type | None | - +--------------------------------+--------------------------------------+ - - nova volume-attach INSTANCE_ID VOLUME_ID auto - - +----------+--------------------------------------+ - | Property | Value | - +----------+--------------------------------------+ - | device | /dev/vdc | - | id | 4f5b8ae8-9781-411e-8ced-de616ae64cfd | - | serverId | 3bf5e176-be05-4634-8cbd-e5fe491f5f9c | - | volumeId | 4f5b8ae8-9781-411e-8ced-de616ae64cfd | - +----------+--------------------------------------+ - - openstack volume list - - +--------------------------------------+---------------+----------------+------+-------------------------------------------+ - | ID | Display Name | Status | Size | Attached to | - +--------------------------------------+---------------+----------------+------+-------------------------------------------+ - | 4f5b8ae8-9781-411e-8ced-de616ae64cfd | my-volume | in-use | 1 | Attached to private-instance on /dev/vdb | - +--------------------------------------+---------------+----------------+------+-------------------------------------------+ - -For more information about how to manage volumes, see the -:cinder-doc:`Manage volumes -<cli/cli-manage-volumes.html>`. - -For more information about how HNAS driver works, see -`Hitachi NAS Platform iSCSI and NFS drives for OpenStack -<https://docs.openstack.org/newton/config-reference/block-storage/drivers/hds-hnas-driver.html>`__. diff --git a/doc/source/reference/storage/cinder-guide.rst b/doc/source/reference/storage/cinder-guide.rst index 55fc9f7d2..3aadd99f5 100644 --- a/doc/source/reference/storage/cinder-guide.rst +++ b/doc/source/reference/storage/cinder-guide.rst @@ -11,7 +11,6 @@ Cinder can be deployed using Kolla and supports the following storage backends: * ceph -* hnas_nfs * iscsi * lvm * nfs @@ -257,9 +256,6 @@ that appears in cinder.conf: * - Network File System (NFS) - cinder_backend_nfs_name - nfs-1 - * - Hitachi NAS Platform NFS - - cinder_backend_hnas_nfs_name - - hnas-nfs * - VMware Virtual Machine Disk File - cinder_backend_vmwarevc_vmdk_name - vmwarevc-vmdk diff --git a/doc/source/reference/storage/index.rst b/doc/source/reference/storage/index.rst index ae37699e0..ad18929a6 100644 --- a/doc/source/reference/storage/index.rst +++ b/doc/source/reference/storage/index.rst @@ -10,7 +10,6 @@ supported by kolla. external-ceph-guide cinder-guide - cinder-guide-hnas cinder-guide-quobyte cinder-guide-pure manila-guide diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index da7574eff..1c7791bcf 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -327,7 +327,6 @@ workaround_ansible_issue_8743: yes #enable_ceph_rgw_loadbalancer: "{{ enable_ceph_rgw | bool }}" #enable_cinder: "no" #enable_cinder_backup: "yes" -#enable_cinder_backend_hnas_nfs: "no" #enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool }}" #enable_cinder_backend_lvm: "no" #enable_cinder_backend_nfs: "no" |