From f85c84133c2f8d6aec3c707cfb92cb03db543bd6 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 26 May 2017 12:12:15 +0400 Subject: [mcp] Replace reclass system models with submodule Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba Signed-off-by: Michael Polenchuk --- .../classes/system/cinder/control/backend/ceph.yml | 13 ----- .../classes/system/cinder/control/backend/lvm.yml | 9 ---- .../classes/system/cinder/control/backend/nfs.yml | 15 ------ .../classes/system/cinder/control/cluster.yml | 58 ---------------------- .../system/cinder/control/notification/cadf.yml | 5 -- .../cinder/control/notification/messagingv2.yml | 6 --- .../classes/system/cinder/control/single.yml | 12 ----- .../classes/system/cinder/volume/backend/ceph.yml | 17 ------- .../system/cinder/volume/backend/hitashi_vsp.yml | 18 ------- .../classes/system/cinder/volume/backend/lvm.yml | 18 ------- .../classes/system/cinder/volume/backend/nfs.yml | 9 ---- mcp/reclass/classes/system/cinder/volume/local.yml | 14 ------ .../cinder/volume/notification/messagingv2.yml | 6 --- .../classes/system/cinder/volume/single.yml | 17 ------- 14 files changed, 217 deletions(-) delete mode 100644 mcp/reclass/classes/system/cinder/control/backend/ceph.yml delete mode 100644 mcp/reclass/classes/system/cinder/control/backend/lvm.yml delete mode 100644 mcp/reclass/classes/system/cinder/control/backend/nfs.yml delete mode 100644 mcp/reclass/classes/system/cinder/control/cluster.yml delete mode 100644 mcp/reclass/classes/system/cinder/control/notification/cadf.yml delete mode 100644 mcp/reclass/classes/system/cinder/control/notification/messagingv2.yml delete mode 100644 mcp/reclass/classes/system/cinder/control/single.yml delete mode 100644 mcp/reclass/classes/system/cinder/volume/backend/ceph.yml delete mode 100644 mcp/reclass/classes/system/cinder/volume/backend/hitashi_vsp.yml delete mode 100644 mcp/reclass/classes/system/cinder/volume/backend/lvm.yml delete mode 100644 mcp/reclass/classes/system/cinder/volume/backend/nfs.yml delete mode 100644 mcp/reclass/classes/system/cinder/volume/local.yml delete mode 100644 mcp/reclass/classes/system/cinder/volume/notification/messagingv2.yml delete mode 100644 mcp/reclass/classes/system/cinder/volume/single.yml (limited to 'mcp/reclass/classes/system/cinder') diff --git a/mcp/reclass/classes/system/cinder/control/backend/ceph.yml b/mcp/reclass/classes/system/cinder/control/backend/ceph.yml deleted file mode 100644 index 1026f6840..000000000 --- a/mcp/reclass/classes/system/cinder/control/backend/ceph.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - cinder: - controller: - default_volume_type: standard-iops - backend: - ceph: - type_name: standard-iops - backend: ceph - pool: ${_param:cinder_storage_pool} - engine: ceph - user: ${_param:cinder_storage_user} - secret_uuid: ${_param:cinder_storage_secret_uuid} - client_cinder_key: ${_param:cinder_storage_client_key} diff --git a/mcp/reclass/classes/system/cinder/control/backend/lvm.yml b/mcp/reclass/classes/system/cinder/control/backend/lvm.yml deleted file mode 100644 index 976a80eaa..000000000 --- a/mcp/reclass/classes/system/cinder/control/backend/lvm.yml +++ /dev/null @@ -1,9 +0,0 @@ -parameters: - cinder: - controller: - default_volume_type: lvm-driver - backend: - lvm-driver: - engine: lvm - type_name: lvm-driver - volume_group: cinder-volume diff --git a/mcp/reclass/classes/system/cinder/control/backend/nfs.yml b/mcp/reclass/classes/system/cinder/control/backend/nfs.yml deleted file mode 100644 index 1e5d5eb77..000000000 --- a/mcp/reclass/classes/system/cinder/control/backend/nfs.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - cinder_nfs_local_path: /var/lib/cinder/nfs - cinder: - controller: - default_volume_type: nfs-driver - backend: - nfs-driver: - engine: nfs - type_name: nfs-driver - volume_group: cinder-volume - path: ${_param:cinder_nfs_local_path} - devices: - - ${_param:cinder_nfs_host}:${_param:cinder_nfs_remote_path} - options: ${_param:cinder_nfs_mount_options} \ No newline at end of file diff --git a/mcp/reclass/classes/system/cinder/control/cluster.yml b/mcp/reclass/classes/system/cinder/control/cluster.yml deleted file mode 100644 index 868b71e6f..000000000 --- a/mcp/reclass/classes/system/cinder/control/cluster.yml +++ /dev/null @@ -1,58 +0,0 @@ -classes: -- service.cinder.control.cluster_control -- service.haproxy.proxy.single -- service.keepalived.cluster.single -- system.haproxy.proxy.listen.openstack.cinder -parameters: - cinder: - volume: - enabled: false - default_volume_type: "" - backend: {} - logging: - heka: - enabled: true - controller: - enabled: true - default_volume_type: "" - backend: {} - version: ${_param:cinder_version} - osapi: - host: ${_param:cluster_local_address} - database: - engine: mysql - host: ${_param:openstack_database_address} - port: 3306 - name: cinder - user: cinder - password: ${_param:mysql_cinder_password} - identity: - engine: keystone - region: ${_param:openstack_region} - host: ${_param:cluster_vip_address} - port: 35357 - tenant: service - user: cinder - password: ${_param:keystone_cinder_password} - glance: - host: ${_param:cluster_vip_address} - port: 9292 - message_queue: - engine: rabbitmq - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - cache: - engine: memcached - members: - - host: ${_param:cluster_node01_address} - port: 11211 - - host: ${_param:cluster_node02_address} - port: 11211 - - host: ${_param:cluster_node03_address} - port: 11211 - diff --git a/mcp/reclass/classes/system/cinder/control/notification/cadf.yml b/mcp/reclass/classes/system/cinder/control/notification/cadf.yml deleted file mode 100644 index 813dade82..000000000 --- a/mcp/reclass/classes/system/cinder/control/notification/cadf.yml +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - cinder: - controller: - audit: - enabled: true diff --git a/mcp/reclass/classes/system/cinder/control/notification/messagingv2.yml b/mcp/reclass/classes/system/cinder/control/notification/messagingv2.yml deleted file mode 100644 index 8fb11724b..000000000 --- a/mcp/reclass/classes/system/cinder/control/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - cinder: - controller: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/cinder/control/single.yml b/mcp/reclass/classes/system/cinder/control/single.yml deleted file mode 100644 index 58156cbb1..000000000 --- a/mcp/reclass/classes/system/cinder/control/single.yml +++ /dev/null @@ -1,12 +0,0 @@ -classes: -- service.cinder.control.single -parameters: - cinder: - volume: - enabled: false - controller: - backend: {} - default_volume_type: '' - database: - host: ${_param:single_address} - diff --git a/mcp/reclass/classes/system/cinder/volume/backend/ceph.yml b/mcp/reclass/classes/system/cinder/volume/backend/ceph.yml deleted file mode 100644 index 6560add2f..000000000 --- a/mcp/reclass/classes/system/cinder/volume/backend/ceph.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - cinder: - volume: - message_queue: - ha_queues: true - enabled: true - notification: true - default_volume_type: standard-iops - backend: - ceph: - type_name: standard-iops - backend: ceph - pool: ${_param:cinder_storage_pool} - engine: ceph - user: ${_param:cinder_storage_user} - secret_uuid: ${_param:cinder_storage_secret_uuid} - client_cinder_key: ${_param:cinder_storage_client_key} diff --git a/mcp/reclass/classes/system/cinder/volume/backend/hitashi_vsp.yml b/mcp/reclass/classes/system/cinder/volume/backend/hitashi_vsp.yml deleted file mode 100644 index e7aa30df6..000000000 --- a/mcp/reclass/classes/system/cinder/volume/backend/hitashi_vsp.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - cinder: - volume: - default_volume_type: hitachi_vsp - enabled: True - backend: - hitachi_vsp: - backend: hitachi_vsp - type_name: hitachi_vsp - engine: hitachi_vsp - version: 1.3 - user: ${_param:cinder_storage_user} - password: ${_param:cinder_storage_password} - storage_id: ${_param:cinder_storage_id} - thin_pool_id: ${_param:cinder_thin_pool_id} - pool_id: ${_param:cinder_pool_id} - target_ports: ${_param:cinder_target_ports} - compute_target_ports: ${_param:cinder_target_compute_ports} diff --git a/mcp/reclass/classes/system/cinder/volume/backend/lvm.yml b/mcp/reclass/classes/system/cinder/volume/backend/lvm.yml deleted file mode 100644 index 768fb6b8b..000000000 --- a/mcp/reclass/classes/system/cinder/volume/backend/lvm.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - _param: - cinder_lvm_devices: [ "/dev/loop0" ] - linux: - storage: - lvm: - cinder-vg: - enabled: true - name: cinder-volume - devices: ${_param:cinder_lvm_devices} - cinder: - volume: - default_volume_type: lvm-driver - backend: - lvm-driver: - engine: lvm - type_name: lvm-driver - volume_group: cinder-volume diff --git a/mcp/reclass/classes/system/cinder/volume/backend/nfs.yml b/mcp/reclass/classes/system/cinder/volume/backend/nfs.yml deleted file mode 100644 index e78f4fb50..000000000 --- a/mcp/reclass/classes/system/cinder/volume/backend/nfs.yml +++ /dev/null @@ -1,9 +0,0 @@ -parameters: - cinder: - volume: - default_volume_type: nfs-driver - backend: - nfs-driver: - engine: nfs - type_name: nfs-driver - volume_group: cinder-volume \ No newline at end of file diff --git a/mcp/reclass/classes/system/cinder/volume/local.yml b/mcp/reclass/classes/system/cinder/volume/local.yml deleted file mode 100644 index 794a33e3a..000000000 --- a/mcp/reclass/classes/system/cinder/volume/local.yml +++ /dev/null @@ -1,14 +0,0 @@ -classes: -- service.cinder.volume.local -parameters: - cinder: - volume: - enabled: True - database: - host: ${_param:single_address} - glance: - host: ${_param:single_address} - message_queue: - host: ${_param:single_address} - identity: - host: ${_param:single_address} diff --git a/mcp/reclass/classes/system/cinder/volume/notification/messagingv2.yml b/mcp/reclass/classes/system/cinder/volume/notification/messagingv2.yml deleted file mode 100644 index 4ccbdd88b..000000000 --- a/mcp/reclass/classes/system/cinder/volume/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - cinder: - volume: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/cinder/volume/single.yml b/mcp/reclass/classes/system/cinder/volume/single.yml deleted file mode 100644 index 9c8f7c2b9..000000000 --- a/mcp/reclass/classes/system/cinder/volume/single.yml +++ /dev/null @@ -1,17 +0,0 @@ -classes: -- service.cinder.volume.single -parameters: - cinder: - volume: - enabled: True - database: - host: ${_param:openstack_database_address} - glance: - host: ${_param:openstack_control_address} - message_queue: - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} - identity: - host: ${_param:openstack_control_address} -- cgit 1.2.3-korg