Remove deprecated cinder engine and type definitions
It was used before backend dictionary was introduced. It was
deprecated during Kilo release cycle. Therefore it is safe
to remove.
Change-Id: Id677ecab69384d1d6382af7c0d066a706ebb12d8
diff --git a/cinder/controller.sls b/cinder/controller.sls
index 8a810de..251abca 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -114,7 +114,6 @@
- require:
- service: cinder_controller_services
-{# new way #}
{%- if not grains.get('noservices', False) %}
{%- for backend_name, backend in controller.get('backend', {}).iteritems() %}
@@ -165,28 +164,6 @@
{%- endif %}
-{# old way #}
-
-{% for type in controller.get('types', []) %}
-
-cinder_type_create_{{ type.name }}:
- cmd.run:
- - name: "source /root/keystonerc; cinder type-create {{ type.name }}"
- - unless: "source /root/keystonerc; cinder type-list | grep {{ type.name }}"
- - shell: /bin/bash
- - require:
- - service: cinder_controller_services
-
-cinder_type_update_{{ type.name }}:
- cmd.run:
- - name: "source /root/keystonerc; cinder type-key {{ type.name }} set volume_backend_name={{ type.get('backend', type.name) }}"
- - unless: "source /root/keystonerc; cinder extra-specs-list | grep \"{u'volume_backend_name': u'{{ type.get('backend', type.name) }}'}\""
- - shell: /bin/bash
- - require:
- - cmd: cinder_type_create_{{ type.name }}
-
-{% endfor %}
-
{%- if controller.backup.engine != None %}
cinder_backup_packages:
diff --git a/cinder/volume.sls b/cinder/volume.sls
index 29f7ef6..d257902 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -68,8 +68,6 @@
- file: /etc/cinder/cinder.conf
- file: /etc/cinder/api-paste.ini
-{# new way #}
-
{%- if volume.backend is defined %}
{%- for backend_name, backend in volume.get('backend', {}).iteritems() %}
@@ -174,92 +172,4 @@
{%- endif %}
-{# old way #}
-
-{%- if volume.storage is defined %}
-
-{%- if volume.storage.engine in ['iscsi', 'hp_lefthand'] %}
-
-cinder_iscsi_packages:
- pkg.installed:
- - names:
- - iscsitarget
- - open-iscsi
- - iscsitarget-dkms
- - require:
- - pkg: cinder_volume_packages
-
-/etc/default/iscsitarget:
- file.managed:
- - source: salt://cinder/files/iscsitarget
- - template: jinja
- - require:
- - pkg: cinder_iscsi_packages
-
-cinder_scsi_service:
- service.running:
- - names:
- - iscsitarget
- - open-iscsi
- - enable: true
- {%- if grains.get('noservices') %}
- - onlyif: /bin/false
- {%- endif %}
- - watch:
- - file: /etc/default/iscsitarget
-
-{%- endif %}
-
-{%- if volume.storage.engine == 'hitachi_vsp' %}
-
-{%- if grains.os_family == 'Debian' and volume.version == 'juno' %}
-
-hitachi_pkgs:
- pkg.latest:
- - names:
- - horcm
- - hbsd
-
-cinder_hitachi_vps_dir:
- file.directory:
- - name: /var/lock/hbsd
- - user: cinder
- - group: cinder
-
-{%- endif %}
-
-{%- endif %}
-
-{%- if volume.storage.engine == 'hp3par' %}
-
-hp3parclient:
- pkg.latest:
- - name: python-hp3parclient
-
-{%- endif %}
-
-{%- if volume.storage.engine == 'fujitsu' %}
-
-cinder_driver_fujitsu:
- pkg.latest:
- - name: cinder-driver-fujitsu
-
-{%- for type in volume.get('types', []) %}
-
-/etc/cinder/cinder_fujitsu_eternus_dx_{{ type.name }}.xml:
- file.managed:
- - source: salt://cinder/files/{{ volume.version }}/cinder_fujitsu_eternus_dx.xml
- - template: jinja
- - defaults:
- volume_type_name: "{{ type.pool }}"
- - require:
- - pkg: cinder-driver-fujitsu
-
-{%- endfor %}
-
-{%- endif %}
-
-{%- endif %}
-
-
{%- endif %}