From a6daf4ece3f05600ad66fea55c5220d07a71cef1 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 24 May 2017 12:44:05 +0400 Subject: [mcp] Bring in reclass system salt models Change-Id: I1a865b7524f3a5242544e60e6b36b1092721c58b 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 insertions(+) create mode 100644 mcp/reclass/classes/system/cinder/control/backend/ceph.yml create mode 100644 mcp/reclass/classes/system/cinder/control/backend/lvm.yml create mode 100644 mcp/reclass/classes/system/cinder/control/backend/nfs.yml create mode 100644 mcp/reclass/classes/system/cinder/control/cluster.yml create mode 100644 mcp/reclass/classes/system/cinder/control/notification/cadf.yml create mode 100644 mcp/reclass/classes/system/cinder/control/notification/messagingv2.yml create mode 100644 mcp/reclass/classes/system/cinder/control/single.yml create mode 100644 mcp/reclass/classes/system/cinder/volume/backend/ceph.yml create mode 100644 mcp/reclass/classes/system/cinder/volume/backend/hitashi_vsp.yml create mode 100644 mcp/reclass/classes/system/cinder/volume/backend/lvm.yml create mode 100644 mcp/reclass/classes/system/cinder/volume/backend/nfs.yml create mode 100644 mcp/reclass/classes/system/cinder/volume/local.yml create mode 100644 mcp/reclass/classes/system/cinder/volume/notification/messagingv2.yml create 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 new file mode 100644 index 000000000..1026f6840 --- /dev/null +++ b/mcp/reclass/classes/system/cinder/control/backend/ceph.yml @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..976a80eaa --- /dev/null +++ b/mcp/reclass/classes/system/cinder/control/backend/lvm.yml @@ -0,0 +1,9 @@ +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 new file mode 100644 index 000000000..1e5d5eb77 --- /dev/null +++ b/mcp/reclass/classes/system/cinder/control/backend/nfs.yml @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000..868b71e6f --- /dev/null +++ b/mcp/reclass/classes/system/cinder/control/cluster.yml @@ -0,0 +1,58 @@ +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 new file mode 100644 index 000000000..813dade82 --- /dev/null +++ b/mcp/reclass/classes/system/cinder/control/notification/cadf.yml @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000..8fb11724b --- /dev/null +++ b/mcp/reclass/classes/system/cinder/control/notification/messagingv2.yml @@ -0,0 +1,6 @@ +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 new file mode 100644 index 000000000..58156cbb1 --- /dev/null +++ b/mcp/reclass/classes/system/cinder/control/single.yml @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000..6560add2f --- /dev/null +++ b/mcp/reclass/classes/system/cinder/volume/backend/ceph.yml @@ -0,0 +1,17 @@ +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 new file mode 100644 index 000000000..e7aa30df6 --- /dev/null +++ b/mcp/reclass/classes/system/cinder/volume/backend/hitashi_vsp.yml @@ -0,0 +1,18 @@ +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 new file mode 100644 index 000000000..768fb6b8b --- /dev/null +++ b/mcp/reclass/classes/system/cinder/volume/backend/lvm.yml @@ -0,0 +1,18 @@ +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 new file mode 100644 index 000000000..e78f4fb50 --- /dev/null +++ b/mcp/reclass/classes/system/cinder/volume/backend/nfs.yml @@ -0,0 +1,9 @@ +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 new file mode 100644 index 000000000..794a33e3a --- /dev/null +++ b/mcp/reclass/classes/system/cinder/volume/local.yml @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000..4ccbdd88b --- /dev/null +++ b/mcp/reclass/classes/system/cinder/volume/notification/messagingv2.yml @@ -0,0 +1,6 @@ +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 new file mode 100644 index 000000000..9c8f7c2b9 --- /dev/null +++ b/mcp/reclass/classes/system/cinder/volume/single.yml @@ -0,0 +1,17 @@ +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