diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-05-26 12:12:15 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-05-26 14:27:47 +0400 |
| commit | f85c84133c2f8d6aec3c707cfb92cb03db543bd6 (patch) | |
| tree | 00ed2d88b364ad39366a8fa6f7f0a27d89d1a283 | |
| parent | 27d968bc35ef4f622acd171ada778a4e0f4c76fb (diff) | |
[mcp] Replace reclass system models with submodule
Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
432 files changed, 13 insertions, 9483 deletions
diff --git a/.gitmodules b/.gitmodules index 4d35439d4..7a28aac6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ url = https://github.com/openstack/fuel-ui.git branch = stable/newton ignore = all +[submodule "mcp/reclass/classes/system"] + path = mcp/reclass/classes/system + url = https://github.com/Mirantis/reclass-system-salt-model diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system new file mode 160000 +Subproject e1bf38ccfd44662c806fe6c7b652b988bc0d6f2 diff --git a/mcp/reclass/classes/system/aodh/server/cluster.yml b/mcp/reclass/classes/system/aodh/server/cluster.yml deleted file mode 100644 index 4743111aa..000000000 --- a/mcp/reclass/classes/system/aodh/server/cluster.yml +++ /dev/null @@ -1,40 +0,0 @@ -classes: -- service.aodh.server.cluster -- system.haproxy.proxy.listen.openstack.aodh -parameters: - aodh: - server: - enabled: true - version: ${_param:aodh_version} - cluster: true - ttl: 86400 - debug: false - verbose: true - region: ${_param:openstack_region} - database: - engine: "mysql+pymysql" - host: ${_param:openstack_database_address} - port: 3306 - name: aodh - user: aodh - password: ${_param:mysql_aodh_password} - bind: - host: ${_param:cluster_local_address} - port: 8042 - identity: - engine: keystone - host: ${_param:keystone_service_host} - port: 35357 - tenant: service - user: aodh - password: ${_param:keystone_aodh_password} - message_queue: - engine: rabbitmq - port: 5672 - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} diff --git a/mcp/reclass/classes/system/aodh/server/coordination/redis.yml b/mcp/reclass/classes/system/aodh/server/coordination/redis.yml deleted file mode 100644 index e013e0fa2..000000000 --- a/mcp/reclass/classes/system/aodh/server/coordination/redis.yml +++ /dev/null @@ -1,7 +0,0 @@ -classes: -- service.redis.server.single -parameters: - aodh: - server: - coordination_backend: - url: redis://${_param:single_address}:6379/${_param:cluster_node01_address} diff --git a/mcp/reclass/classes/system/aodh/server/single.yml b/mcp/reclass/classes/system/aodh/server/single.yml deleted file mode 100644 index eba3fc1f8..000000000 --- a/mcp/reclass/classes/system/aodh/server/single.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.aodh.server.single diff --git a/mcp/reclass/classes/system/apache/server/single.yml b/mcp/reclass/classes/system/apache/server/single.yml deleted file mode 100644 index 06c8c4c67..000000000 --- a/mcp/reclass/classes/system/apache/server/single.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.apache.server.single diff --git a/mcp/reclass/classes/system/ceilometer/agent/cluster.yml b/mcp/reclass/classes/system/ceilometer/agent/cluster.yml deleted file mode 100644 index 135dbe8a9..000000000 --- a/mcp/reclass/classes/system/ceilometer/agent/cluster.yml +++ /dev/null @@ -1,31 +0,0 @@ -classes: -- service.ceilometer.agent.cluster -parameters: - ceilometer: - agent: - region: ${_param:openstack_region} - enabled: true - version: ${_param:ceilometer_version} - secret: ${_param:ceilometer_secret_key} - identity: - engine: keystone - host: ${_param:keystone_service_host} - port: 35357 - tenant: service - user: ceilometer - password: ${_param:keystone_ceilometer_password} - 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' - ha_queues: true - rpc_thread_pool_size: 5 - nova: - compute: - notification: - driver: messagingv2 diff --git a/mcp/reclass/classes/system/ceilometer/agent/single.yml b/mcp/reclass/classes/system/ceilometer/agent/single.yml deleted file mode 100644 index ebb1d6043..000000000 --- a/mcp/reclass/classes/system/ceilometer/agent/single.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.ceilometer.agent.single diff --git a/mcp/reclass/classes/system/ceilometer/client/cinder_control.yml b/mcp/reclass/classes/system/ceilometer/client/cinder_control.yml deleted file mode 100644 index 2e90aff6b..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/cinder_control.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - cinder: - controller: - notification: true
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/client/cinder_volume.yml b/mcp/reclass/classes/system/ceilometer/client/cinder_volume.yml deleted file mode 100644 index 4d57c97e4..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/cinder_volume.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - cinder: - volume: - notification: true
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/client/glance.yml b/mcp/reclass/classes/system/ceilometer/client/glance.yml deleted file mode 100644 index 48b1ba152..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/glance.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - glance: - server: - notification: true
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/client/heat.yml b/mcp/reclass/classes/system/ceilometer/client/heat.yml deleted file mode 100644 index 0cb467758..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/heat.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - heat: - server: - notification: true
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/client/init.yml b/mcp/reclass/classes/system/ceilometer/client/init.yml deleted file mode 100644 index 5a0aaa070..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/init.yml +++ /dev/null @@ -1,6 +0,0 @@ -classes: -- system.ceilometer.client.cinder_control -- system.ceilometer.client.keystone -- system.ceilometer.client.glance -- system.ceilometer.client.heat -- system.ceilometer.client.nova_control
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/client/keystone.yml b/mcp/reclass/classes/system/ceilometer/client/keystone.yml deleted file mode 100644 index c09b3802d..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/keystone.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - keystone: - server: - notification: true
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/client/neutron.yml b/mcp/reclass/classes/system/ceilometer/client/neutron.yml deleted file mode 100644 index 4f0538571..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/neutron.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - neutron: - server: - notification: true
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/client/nova_compute.yml b/mcp/reclass/classes/system/ceilometer/client/nova_compute.yml deleted file mode 100644 index 57e900a7f..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/nova_compute.yml +++ /dev/null @@ -1,7 +0,0 @@ -parameters: - nova: - compute: - notification: - driver: messagingv2 - notify_on: - state_change: vm_and_task_state
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/client/nova_control.yml b/mcp/reclass/classes/system/ceilometer/client/nova_control.yml deleted file mode 100644 index 252c67e26..000000000 --- a/mcp/reclass/classes/system/ceilometer/client/nova_control.yml +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - nova: - controller: - notification: - driver: messagingv2 diff --git a/mcp/reclass/classes/system/ceilometer/server/backend/influxdb.yml b/mcp/reclass/classes/system/ceilometer/server/backend/influxdb.yml deleted file mode 100644 index 8faeceb8d..000000000 --- a/mcp/reclass/classes/system/ceilometer/server/backend/influxdb.yml +++ /dev/null @@ -1,14 +0,0 @@ -parameters: - ceilometer: - server: - database: - influxdb: - host: ${_param:stacklight_telemetry_node01_address} - port: 8086 - user: ceilometer - password: ${_param:ceilometer_influxdb_password} - database: ceilometer - elasticsearch: - enabled: true - host: ${_param:stacklight_log_address} - port: 9200
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/server/backend/mongodb.yml b/mcp/reclass/classes/system/ceilometer/server/backend/mongodb.yml deleted file mode 100644 index eab849457..000000000 --- a/mcp/reclass/classes/system/ceilometer/server/backend/mongodb.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - ceilometer: - server: - database: - engine: mongodb - members: - - host: ${_param:cluster_node01_address} - port: 27017 - - host: ${_param:cluster_node02_address} - port: 27017 - - host: ${_param:cluster_node03_address} - port: 27017 - name: ceilometer - user: ceilometer - password: ${_param:mongodb_ceilometer_password}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/ceilometer/server/cluster.yml b/mcp/reclass/classes/system/ceilometer/server/cluster.yml deleted file mode 100644 index cfe54f95b..000000000 --- a/mcp/reclass/classes/system/ceilometer/server/cluster.yml +++ /dev/null @@ -1,37 +0,0 @@ -classes: -- service.ceilometer.server.cluster -- system.haproxy.proxy.listen.openstack.ceilometer -- system.keepalived.cluster.instance.openstack_telemetry_vip -- service.haproxy.proxy.single -parameters: - ceilometer: - server: - enabled: true - version: ${_param:ceilometer_version} - region: ${_param:openstack_region} - cluster: true - secret: ${_param:ceilometer_secret_key} - ttl: 86400 - publisher: - default: - bind: - host: ${_param:cluster_local_address} - port: 8777 - identity: - engine: keystone - host: ${_param:openstack_control_address} - port: 35357 - tenant: service - user: ceilometer - password: ${_param:keystone_ceilometer_password} - 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' - # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715 - rpc_thread_pool_size: 5 diff --git a/mcp/reclass/classes/system/ceilometer/server/coordination/redis.yml b/mcp/reclass/classes/system/ceilometer/server/coordination/redis.yml deleted file mode 100644 index e013e0fa2..000000000 --- a/mcp/reclass/classes/system/ceilometer/server/coordination/redis.yml +++ /dev/null @@ -1,7 +0,0 @@ -classes: -- service.redis.server.single -parameters: - aodh: - server: - coordination_backend: - url: redis://${_param:single_address}:6379/${_param:cluster_node01_address} diff --git a/mcp/reclass/classes/system/ceilometer/server/single.yml b/mcp/reclass/classes/system/ceilometer/server/single.yml deleted file mode 100644 index 9758af2aa..000000000 --- a/mcp/reclass/classes/system/ceilometer/server/single.yml +++ /dev/null @@ -1,16 +0,0 @@ -classes: -- service.ceilometer.server.single -parameters: - ceilometer: - server: - database: - influxdb: - host: ${_param:stacklight_monitor_node01_address} - port: 8086 - user: ceilometer - password: ${_param:ceilometer_influxdb_password} - database: ceilometer - elasticsearch: - enabled: true - host: ${_param:stacklight_monitor_address} - port: 9200 diff --git a/mcp/reclass/classes/system/ceph/client/single.yml b/mcp/reclass/classes/system/ceph/client/single.yml deleted file mode 100644 index 6ff7cd8f9..000000000 --- a/mcp/reclass/classes/system/ceph/client/single.yml +++ /dev/null @@ -1,37 +0,0 @@ -classes: -- service.ceph.client.single -parameters: - _param: - ceph_auth_client_required: cephx - ceph: - client: - config: - global: - fsid: ${_param:ceph_fsid} - mon_initial_members: ${_param:ceph_mon_initial_members} - mon_host: ${_param:ceph_mon_host} - auth_client_required: ${_param:ceph_auth_client_required} - public_network: ${_param:ceph_public_network} - cluster_network: ${_param:ceph_cluster_network} - osd_fs_mount_options_xfs: rw,noatime - osd_fs_type: xfs - osd: - filestore_xattr_use_omap: True - osd_journal_size: 7500 - mon: - mon_debug_dump_transactions: False - client: - rbd_cache_size: 268435456 - rbd_cache_max_dirty: 134217728 - rbd_cache_max_dirty_age: 5 - rbd_cache: True - # TODO: Configure these keys on cluster level - # keyring: - # images: - # key: - # object: - # key: - # cinder: - # key: - # nova: - # key: diff --git a/mcp/reclass/classes/system/ceph/radosgw/single.yml b/mcp/reclass/classes/system/ceph/radosgw/single.yml deleted file mode 100644 index 31bdc7db9..000000000 --- a/mcp/reclass/classes/system/ceph/radosgw/single.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: - _param: - radosgw_keyring_path: /etc/ceph/ceph.client.radosgw.keyring - ceph: - radosgw: - enabled: true - client: - config: - client.radosgw.gateway: - rgw_keystone_accepted_roles: "_member_, Member, admin, swiftoperator" - keyring: /etc/ceph/ceph.client.radosgw.keyring - rgw_socket_path: /tmp/radosgw.sock - rgw_keystone_revocation_interval: 60 - rgw_keystone_url: ${_param:keystone_service_host}:5000 - rgw_keystone_admin_token: ${_param:keystone_service_token} - host: ${linux:system:name} - rgw_dns_name : ${_param:cluster_domain} - rgw_print_continue: True - rgw_content_length_compat: true - user: www-data 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} diff --git a/mcp/reclass/classes/system/collectd/client/local.yml b/mcp/reclass/classes/system/collectd/client/local.yml deleted file mode 100644 index b1c88431b..000000000 --- a/mcp/reclass/classes/system/collectd/client/local.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.collectd.client diff --git a/mcp/reclass/classes/system/collectd/client/output/carbon.yml b/mcp/reclass/classes/system/collectd/client/output/carbon.yml deleted file mode 100644 index 47e8c73dc..000000000 --- a/mcp/reclass/classes/system/collectd/client/output/carbon.yml +++ /dev/null @@ -1,14 +0,0 @@ -classes: -- service.collectd.client -parameters: - _param: - collectd_backend_carbon_host: localhost - collectd_backend_carbon_port: 2003 - collectd: - client: - enabled: true - backend: - carbon: - engine: carbon - host: ${_param:collectd_backend_carbon_host} - port: ${_param:collectd_backend_carbon_port}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/collectd/client/output/heka.yml b/mcp/reclass/classes/system/collectd/client/output/heka.yml deleted file mode 100644 index 9550961ca..000000000 --- a/mcp/reclass/classes/system/collectd/client/output/heka.yml +++ /dev/null @@ -1,17 +0,0 @@ -classes: -- service.collectd.client -parameters: - _param: - collectd_metric_collector_host: 127.0.0.1 - collectd_metric_collector_port: 8325 - collectd: - client: - enabled: true - backend: - metric_collector: - engine: http - host: ${_param:collectd_metric_collector_host} - port: ${_param:collectd_metric_collector_port} - read_interval: 10 - use_fqdn: false - syslog_logging: false diff --git a/mcp/reclass/classes/system/collectd/remote_client/cluster.yml b/mcp/reclass/classes/system/collectd/remote_client/cluster.yml deleted file mode 100644 index 1edced034..000000000 --- a/mcp/reclass/classes/system/collectd/remote_client/cluster.yml +++ /dev/null @@ -1,18 +0,0 @@ -classes: -- system.collectd.remote_client.output.heka -- service.collectd.remote_client.cluster -parameters: - collectd: - remote_client: - automatic_starting: false - keepalived: - cluster: - instance: - stacklight_monitor_vip: - notify_action: - master: - - service remote_collectd start - backup: - - service remote_collectd stop - fault: - - service remote_collectd stop diff --git a/mcp/reclass/classes/system/collectd/remote_client/output/heka.yml b/mcp/reclass/classes/system/collectd/remote_client/output/heka.yml deleted file mode 100644 index a5a509d04..000000000 --- a/mcp/reclass/classes/system/collectd/remote_client/output/heka.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - collectd_remote_collector_port: 8326 - collectd: - remote_client: - enabled: true - backend: - remote_collector: - engine: http - host: ${_param:collectd_remote_collector_host} - port: ${_param:collectd_remote_collector_port} - timeout: 5 - read_interval: 10 - use_fqdn: false - syslog_logging: false diff --git a/mcp/reclass/classes/system/collectd/remote_client/single.yml b/mcp/reclass/classes/system/collectd/remote_client/single.yml deleted file mode 100644 index f49e40db7..000000000 --- a/mcp/reclass/classes/system/collectd/remote_client/single.yml +++ /dev/null @@ -1,7 +0,0 @@ -classes: -- system.collectd.remote_client.output.heka -- service.collectd.remote_client.single -parameters: - collectd: - remote_client: - automatic_starting: true diff --git a/mcp/reclass/classes/system/designate/server/backend/bind.yml b/mcp/reclass/classes/system/designate/server/backend/bind.yml deleted file mode 100644 index 2b4042486..000000000 --- a/mcp/reclass/classes/system/designate/server/backend/bind.yml +++ /dev/null @@ -1,36 +0,0 @@ -parameters: - designate: - server: - backend: - bind9: - rndc_key: "${_param:designate_bind9_rndc_key}" - bind: - server: - key: - designate: - secret: "${_param:designate_bind9_rndc_key}" - algorithm: hmac-sha512 - allow_new_zones: true - query: true - control: - local: - enabled: true - bind: - address: 127.0.0.1 - port: 953 - allow: - - 127.0.0.1 - - ${_param:single_address} - keys: - - designate - client: - enabled: true - option: - default: - server: 127.0.0.1 - port: 953 - key: designate - key: - designate: - secret: "${_param:designate_bind9_rndc_key}" - algorithm: hmac-sha512 diff --git a/mcp/reclass/classes/system/designate/server/cluster.yml b/mcp/reclass/classes/system/designate/server/cluster.yml deleted file mode 100644 index 573ac66fa..000000000 --- a/mcp/reclass/classes/system/designate/server/cluster.yml +++ /dev/null @@ -1,59 +0,0 @@ -classes: -- service.designate.server.cluster -- service.keepalived.cluster.single -- system.haproxy.proxy.listen.openstack.designate -- service.haproxy.proxy.single -parameters: - designate: - _support: - sensu: - enabled: false - server: - enabled: true - local_bind: true - region: ${_param:openstack_region} - domain_id: ${_param:designate_domain_id} - version: ${_param:designate_version} - database: - engine: mysql - host: ${_param:openstack_database_address} - port: 3306 - name: - main_database: designate - pool_manager: designate_pool_manager - user: designate - password: ${_param:mysql_designate_password} - identity: - engine: keystone - host: ${_param:openstack_control_address} - port: 35357 - tenant: service - user: designate - password: ${_param:keystone_designate_password} - bind: - api: - address: ${_param:single_address} - message_queue: - engine: rabbitmq - port: 5672 - 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' - pool: - pool_id: ${_param:designate_pool_id} - nameservers: - - uuid: ${_param:designate_node1_uuid} - host: ${_param:cluster_node01_address} - port: 53 - - uuid: ${_param:designate_node2_uuid} - host: ${_param:cluster_node02_address} - port: 53 - targets: - uuid: ${_param:designate_target_uuid} - options: 'port: 53, host: 127.0.0.1' - masters: 127.0.0.1:5354 - type: ${_param:designate_target_type} diff --git a/mcp/reclass/classes/system/designate/server/single.yml b/mcp/reclass/classes/system/designate/server/single.yml deleted file mode 100644 index bef6e4df5..000000000 --- a/mcp/reclass/classes/system/designate/server/single.yml +++ /dev/null @@ -1,37 +0,0 @@ -classes: -- service.designate.server.single -- service.haproxy.proxy.single -parameters: - designate: - server: - enabled: true - local_bind: true - region: ${_param:openstack_region} - domain_id: ${_param:designate_domain_id} - version: ${_param:designate_version} - bind: - api: - address: ${_param:single_address} - database: - engine: mysql - host: ${_param:openstack_database_address} - port: 3306 - name: - main_database: designate - pool_manager: designate_pool_manager - user: designate - password: ${_param:mysql_designate_password} - identity: - engine: keystone - host: ${_param:openstack_control_address} - port: 35357 - tenant: service - user: designate - password: ${_param:keystone_designate_password} - message_queue: - engine: rabbitmq - host: ${_param:cluster_vip_address} - port: 5672 - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' diff --git a/mcp/reclass/classes/system/galera/server/cluster.yml b/mcp/reclass/classes/system/galera/server/cluster.yml deleted file mode 100644 index f1c3a480e..000000000 --- a/mcp/reclass/classes/system/galera/server/cluster.yml +++ /dev/null @@ -1,4 +0,0 @@ -classes: -- service.keepalived.cluster.single -- service.haproxy.proxy.single -- system.haproxy.proxy.listen.openstack.galera
\ No newline at end of file diff --git a/mcp/reclass/classes/system/galera/server/database/aodh.yml b/mcp/reclass/classes/system/galera/server/database/aodh.yml deleted file mode 100644 index f5095d2d1..000000000 --- a/mcp/reclass/classes/system/galera/server/database/aodh.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - mysql: - server: - database: - aodh: - encoding: utf8 - users: - - name: aodh - password: ${_param:mysql_aodh_password} - host: '%' - rights: all - - name: aodh - password: ${_param:mysql_aodh_password} - host: ${_param:cluster_vip_address} - rights: all diff --git a/mcp/reclass/classes/system/galera/server/database/ceilometer.yml b/mcp/reclass/classes/system/galera/server/database/ceilometer.yml deleted file mode 100644 index b33c8f985..000000000 --- a/mcp/reclass/classes/system/galera/server/database/ceilometer.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - mysql: - server: - database: - ceilometer: - encoding: utf8 - users: - - name: ceilometer - password: ${_param:mysql_ceilometer_password} - host: '%' - rights: all - - name: ceilometer - password: ${_param:mysql_ceilometer_password} - host: ${_param:cluster_local_address} - rights: all diff --git a/mcp/reclass/classes/system/galera/server/database/cinder.yml b/mcp/reclass/classes/system/galera/server/database/cinder.yml deleted file mode 100644 index 08b6ddb3d..000000000 --- a/mcp/reclass/classes/system/galera/server/database/cinder.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - mysql: - server: - database: - cinder: - encoding: utf8 - users: - - name: cinder - password: ${_param:mysql_cinder_password} - host: '%' - rights: all - - name: cinder - password: ${_param:mysql_cinder_password} - host: ${_param:cluster_local_address} - rights: all diff --git a/mcp/reclass/classes/system/galera/server/database/glance.yml b/mcp/reclass/classes/system/galera/server/database/glance.yml deleted file mode 100644 index 7e5e443bf..000000000 --- a/mcp/reclass/classes/system/galera/server/database/glance.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - mysql: - server: - database: - glance: - encoding: utf8 - users: - - name: glance - password: ${_param:mysql_glance_password} - host: '%' - rights: all - - name: glance - password: ${_param:mysql_glance_password} - host: ${_param:cluster_local_address} - rights: all diff --git a/mcp/reclass/classes/system/galera/server/database/grafana.yml b/mcp/reclass/classes/system/galera/server/database/grafana.yml deleted file mode 100644 index fa4742e96..000000000 --- a/mcp/reclass/classes/system/galera/server/database/grafana.yml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: - mysql: - server: - database: - grafana: - encoding: utf8 - users: - - name: grafana - password: ${_param:mysql_grafana_password} - host: '%' - rights: all - - name: grafana - password: ${_param:mysql_grafana_password} - host: ${_param:cluster_local_address} - rights: all - diff --git a/mcp/reclass/classes/system/galera/server/database/graphite.yml b/mcp/reclass/classes/system/galera/server/database/graphite.yml deleted file mode 100644 index 8ba6efdd8..000000000 --- a/mcp/reclass/classes/system/galera/server/database/graphite.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - mysql: - server: - database: - graphite: - encoding: 'utf8' - users: - - name: 'graphite' - password: '${_param:mysql_graphite_password}' - host: '%' - rights: 'all' diff --git a/mcp/reclass/classes/system/galera/server/database/heat.yml b/mcp/reclass/classes/system/galera/server/database/heat.yml deleted file mode 100644 index 0d716d861..000000000 --- a/mcp/reclass/classes/system/galera/server/database/heat.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - mysql: - server: - database: - heat: - encoding: utf8 - users: - - name: heat - password: ${_param:mysql_heat_password} - host: '%' - rights: all - - name: heat - password: ${_param:mysql_heat_password} - host: ${_param:cluster_local_address} - rights: all diff --git a/mcp/reclass/classes/system/galera/server/database/keystone.yml b/mcp/reclass/classes/system/galera/server/database/keystone.yml deleted file mode 100644 index fc2c5eb85..000000000 --- a/mcp/reclass/classes/system/galera/server/database/keystone.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - mysql: - server: - database: - keystone: - encoding: utf8 - users: - - name: keystone - password: ${_param:mysql_keystone_password} - host: '%' - rights: all - - name: keystone - password: ${_param:mysql_keystone_password} - host: ${_param:cluster_local_address} - rights: all diff --git a/mcp/reclass/classes/system/galera/server/database/neutron.yml b/mcp/reclass/classes/system/galera/server/database/neutron.yml deleted file mode 100644 index 58dd01264..000000000 --- a/mcp/reclass/classes/system/galera/server/database/neutron.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - mysql: - server: - database: - neutron: - encoding: 'utf8' - users: - - name: 'neutron' - password: '${_param:mysql_neutron_password}' - host: '%' - rights: 'all' - - name: 'neutron' - password: '${_param:mysql_neutron_password}' - host: '${_param:cluster_local_address}' - rights: 'all' diff --git a/mcp/reclass/classes/system/galera/server/database/nova.yml b/mcp/reclass/classes/system/galera/server/database/nova.yml deleted file mode 100644 index 86d482168..000000000 --- a/mcp/reclass/classes/system/galera/server/database/nova.yml +++ /dev/null @@ -1,37 +0,0 @@ -parameters: - mysql: - server: - database: - nova: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:cluster_local_address} - rights: all - nova_api: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:cluster_local_address} - rights: all - nova_cell0: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:cluster_local_address} - rights: all diff --git a/mcp/reclass/classes/system/glance/control/cluster.yml b/mcp/reclass/classes/system/glance/control/cluster.yml deleted file mode 100644 index b009e9e9c..000000000 --- a/mcp/reclass/classes/system/glance/control/cluster.yml +++ /dev/null @@ -1,45 +0,0 @@ -classes: -- service.glance.control.cluster -- service.keepalived.cluster.single -- service.haproxy.proxy.single -- system.haproxy.proxy.listen.openstack.glance -parameters: - glance: - server: - enabled: true - version: ${_param:glance_version} - workers: 8 - database: - engine: mysql - host: ${_param:openstack_database_address} - port: 3306 - name: glance - user: glance - password: ${_param:mysql_glance_password} - registry: - host: ${_param:cluster_vip_address} - port: 9191 - bind: - address: ${_param:cluster_local_address} - port: 9292 - identity: - engine: keystone - host: ${_param:cluster_vip_address} - port: 35357 - user: glance - password: ${_param:keystone_glance_password} - region: ${_param:openstack_region} - tenant: service - message_queue: - engine: rabbitmq - port: 5672 - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} - storage: - engine: file - images: []
\ No newline at end of file diff --git a/mcp/reclass/classes/system/glance/control/notification/cadf.yml b/mcp/reclass/classes/system/glance/control/notification/cadf.yml deleted file mode 100644 index 0f2fbae74..000000000 --- a/mcp/reclass/classes/system/glance/control/notification/cadf.yml +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - glance: - server: - audit: - enabled: true diff --git a/mcp/reclass/classes/system/glance/control/notification/messagingv2.yml b/mcp/reclass/classes/system/glance/control/notification/messagingv2.yml deleted file mode 100644 index 7020add43..000000000 --- a/mcp/reclass/classes/system/glance/control/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - glance: - server: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/glance/control/single.yml b/mcp/reclass/classes/system/glance/control/single.yml deleted file mode 100644 index 13f443465..000000000 --- a/mcp/reclass/classes/system/glance/control/single.yml +++ /dev/null @@ -1,7 +0,0 @@ -classes: -- service.glance.control.single -parameters: - glance: - server: - database: - host: ${_param:single_address} diff --git a/mcp/reclass/classes/system/glance/control/storage/ceph.yml b/mcp/reclass/classes/system/glance/control/storage/ceph.yml deleted file mode 100644 index d48fb6d71..000000000 --- a/mcp/reclass/classes/system/glance/control/storage/ceph.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - glance: - server: - storage: - engine: rbd,http - user: ${_param:glance_storage_user} - pool: ${_param:glance_storage_pool} - chunk_size: 8
\ No newline at end of file diff --git a/mcp/reclass/classes/system/glusterfs/client/cluster.yml b/mcp/reclass/classes/system/glusterfs/client/cluster.yml deleted file mode 100644 index 24eab4fa5..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/cluster.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.glusterfs.client
\ No newline at end of file diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/aptly.yml b/mcp/reclass/classes/system/glusterfs/client/volume/aptly.yml deleted file mode 100644 index 659f59d16..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/aptly.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - aptly_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - aptly: - path: /srv/volumes/aptly - server: ${_param:aptly_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/artifactory.yml b/mcp/reclass/classes/system/glusterfs/client/volume/artifactory.yml deleted file mode 100644 index 878131fbb..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/artifactory.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - artifactory_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - artifactory: - path: /srv/volumes/artifactory - server: ${_param:artifactory_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/devops_portal.yml b/mcp/reclass/classes/system/glusterfs/client/volume/devops_portal.yml deleted file mode 100644 index dc422012b..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/devops_portal.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - devops_portal_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - devops_portal: - path: /srv/volumes/devops_portal - server: ${_param:devops_portal_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/elasticsearch.yml b/mcp/reclass/classes/system/glusterfs/client/volume/elasticsearch.yml deleted file mode 100644 index 02480937e..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/elasticsearch.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - elasticsearch_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - elasticsearch: - path: /srv/volumes/elasticsearch - server: ${_param:elasticsearch_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/gerrit.yml b/mcp/reclass/classes/system/glusterfs/client/volume/gerrit.yml deleted file mode 100644 index 4598683b9..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/gerrit.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - gerrit_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - gerrit: - path: /srv/volumes/gerrit - server: ${_param:gerrit_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" - user: 1000 - group: 1000 diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/glance.yml b/mcp/reclass/classes/system/glusterfs/client/volume/glance.yml deleted file mode 100644 index ec593b9fa..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/glance.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - glance_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - glance: - path: /var/lib/glance/images - server: ${_param:glance_glusterfs_service_host} - user: glance - group: glance - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/jenkins.yml b/mcp/reclass/classes/system/glusterfs/client/volume/jenkins.yml deleted file mode 100644 index c9fa258be..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/jenkins.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - jenkins_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - jenkins: - path: /srv/volumes/jenkins - server: ${_param:jenkins_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" - user: 1000 - group: 1000 diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/keystone.yml b/mcp/reclass/classes/system/glusterfs/client/volume/keystone.yml deleted file mode 100644 index 713902972..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/keystone.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - keystone_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - keystone-keys: - path: /var/lib/keystone/fernet-keys - server: ${_param:keystone_glusterfs_service_host} - user: keystone - group: keystone - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/mysql.yml b/mcp/reclass/classes/system/glusterfs/client/volume/mysql.yml deleted file mode 100644 index 7761a0735..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/mysql.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - mysql_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - mysql: - path: /srv/volumes/mysql - server: ${_param:mysql_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/openldap.yml b/mcp/reclass/classes/system/glusterfs/client/volume/openldap.yml deleted file mode 100644 index 22b10cd9c..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/openldap.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - openldap_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - openldap: - path: /srv/volumes/openldap - server: ${_param:openldap_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/postgresql.yml b/mcp/reclass/classes/system/glusterfs/client/volume/postgresql.yml deleted file mode 100644 index b49c905d8..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/postgresql.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - postgresql_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - postgresql: - path: /srv/volumes/postgresql - server: ${_param:postgresql_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/prometheus.yml b/mcp/reclass/classes/system/glusterfs/client/volume/prometheus.yml deleted file mode 100644 index 3fae59b3a..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/prometheus.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - prometheus_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - prometheus: - path: /srv/volumes/prometheus - server: ${_param:prometheus_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/pushkin.yml b/mcp/reclass/classes/system/glusterfs/client/volume/pushkin.yml deleted file mode 100644 index ee09ef860..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/pushkin.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - pushkin_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - pushkin: - path: /srv/volumes/pushkin - server: ${_param:pushkin_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/registry.yml b/mcp/reclass/classes/system/glusterfs/client/volume/registry.yml deleted file mode 100644 index af932a681..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/registry.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - registry_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - registry: - path: /srv/volumes/registry - server: ${_param:registry_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/rundeck.yml b/mcp/reclass/classes/system/glusterfs/client/volume/rundeck.yml deleted file mode 100644 index f0c6ccdf9..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/rundeck.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - rundeck_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - rundeck: - path: /srv/volumes/rundeck - server: ${_param:rundeck_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/salt.yml b/mcp/reclass/classes/system/glusterfs/client/volume/salt.yml deleted file mode 100644 index 048d38b94..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/salt.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - salt_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - saltmaster: - path: /etc/salt/pki/master - server: ${_param:salt_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/salt_pki.yml b/mcp/reclass/classes/system/glusterfs/client/volume/salt_pki.yml deleted file mode 100644 index 9083e19ba..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/salt_pki.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - salt_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - salt_pki: - path: /srv/salt/pki - server: ${_param:salt_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/client/volume/security_monkey.yml b/mcp/reclass/classes/system/glusterfs/client/volume/security_monkey.yml deleted file mode 100644 index b00866978..000000000 --- a/mcp/reclass/classes/system/glusterfs/client/volume/security_monkey.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - _param: - security_monkey_glusterfs_service_host: ${_param:glusterfs_service_host} - glusterfs_node01_address: ${_param:cluster_node01_address} - glusterfs_node02_address: ${_param:cluster_node02_address} - glusterfs_node03_address: ${_param:cluster_node03_address} - glusterfs: - client: - volumes: - security_monkey: - path: /srv/volumes/security_monkey - server: ${_param:security_monkey_glusterfs_service_host} - opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}" diff --git a/mcp/reclass/classes/system/glusterfs/cluster.yml b/mcp/reclass/classes/system/glusterfs/cluster.yml deleted file mode 100644 index 8a5c59539..000000000 --- a/mcp/reclass/classes/system/glusterfs/cluster.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.glusterfs.server diff --git a/mcp/reclass/classes/system/glusterfs/server/cluster.yml b/mcp/reclass/classes/system/glusterfs/server/cluster.yml deleted file mode 100644 index 87aa0e950..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/cluster.yml +++ /dev/null @@ -1,12 +0,0 @@ -classes: -- service.glusterfs.server -parameters: - glusterfs: - _support: - iptables: - enabled: false - server: - peers: - - ${_param:cluster_node01_address} - - ${_param:cluster_node02_address} - - ${_param:cluster_node03_address} diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/aptly.yml b/mcp/reclass/classes/system/glusterfs/server/volume/aptly.yml deleted file mode 100644 index db0163821..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/aptly.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - aptly: - storage: /srv/glusterfs/aptly - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/aptly - - ${_param:cluster_node02_address}:/srv/glusterfs/aptly - - ${_param:cluster_node03_address}:/srv/glusterfs/aptly - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/artifactory.yml b/mcp/reclass/classes/system/glusterfs/server/volume/artifactory.yml deleted file mode 100644 index a19115e9c..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/artifactory.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - artifactory: - storage: /srv/glusterfs/artifactory - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/artifactory - - ${_param:cluster_node02_address}:/srv/glusterfs/artifactory - - ${_param:cluster_node03_address}:/srv/glusterfs/artifactory - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/devops_portal.yml b/mcp/reclass/classes/system/glusterfs/server/volume/devops_portal.yml deleted file mode 100644 index 0b71b6280..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/devops_portal.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - devops_portal: - storage: /srv/glusterfs/devops_portal - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/devops_portal - - ${_param:cluster_node02_address}:/srv/glusterfs/devops_portal - - ${_param:cluster_node03_address}:/srv/glusterfs/devops_portal - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/elasticsearch.yml b/mcp/reclass/classes/system/glusterfs/server/volume/elasticsearch.yml deleted file mode 100644 index 73f35c102..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/elasticsearch.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - elasticsearch: - storage: /srv/glusterfs/elasticsearch - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/elasticsearch - - ${_param:cluster_node02_address}:/srv/glusterfs/elasticsearch - - ${_param:cluster_node03_address}:/srv/glusterfs/elasticsearch - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/gerrit.yml b/mcp/reclass/classes/system/glusterfs/server/volume/gerrit.yml deleted file mode 100644 index 6667f936b..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/gerrit.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - gerrit: - storage: /srv/glusterfs/gerrit - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/gerrit - - ${_param:cluster_node02_address}:/srv/glusterfs/gerrit - - ${_param:cluster_node03_address}:/srv/glusterfs/gerrit - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/glance.yml b/mcp/reclass/classes/system/glusterfs/server/volume/glance.yml deleted file mode 100644 index 8276a448a..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/glance.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - glance: - storage: /srv/glusterfs/glance - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/glance - - ${_param:cluster_node02_address}:/srv/glusterfs/glance - - ${_param:cluster_node03_address}:/srv/glusterfs/glance - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING
\ No newline at end of file diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/jenkins.yml b/mcp/reclass/classes/system/glusterfs/server/volume/jenkins.yml deleted file mode 100644 index 5c077d0bb..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/jenkins.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - jenkins: - storage: /srv/glusterfs/jenkins - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/jenkins - - ${_param:cluster_node02_address}:/srv/glusterfs/jenkins - - ${_param:cluster_node03_address}:/srv/glusterfs/jenkins - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/keystone.yml b/mcp/reclass/classes/system/glusterfs/server/volume/keystone.yml deleted file mode 100644 index 229d787d5..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/keystone.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - keystone-keys: - storage: /srv/glusterfs/keystone-keys - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/keystone-keys - - ${_param:cluster_node02_address}:/srv/glusterfs/keystone-keys - - ${_param:cluster_node03_address}:/srv/glusterfs/keystone-keys - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING
\ No newline at end of file diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/mysql.yml b/mcp/reclass/classes/system/glusterfs/server/volume/mysql.yml deleted file mode 100644 index 0e7367c37..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/mysql.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - mysql: - storage: /srv/glusterfs/mysql - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/mysql - - ${_param:cluster_node02_address}:/srv/glusterfs/mysql - - ${_param:cluster_node03_address}:/srv/glusterfs/mysql - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING
\ No newline at end of file diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/openldap.yml b/mcp/reclass/classes/system/glusterfs/server/volume/openldap.yml deleted file mode 100644 index d507b44f7..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/openldap.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - openldap: - storage: /srv/glusterfs/openldap - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/openldap - - ${_param:cluster_node02_address}:/srv/glusterfs/openldap - - ${_param:cluster_node03_address}:/srv/glusterfs/openldap - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/postgresql.yml b/mcp/reclass/classes/system/glusterfs/server/volume/postgresql.yml deleted file mode 100644 index 26290f888..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/postgresql.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - postgresql: - storage: /srv/glusterfs/postgresql - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/postgresql - - ${_param:cluster_node02_address}:/srv/glusterfs/postgresql - - ${_param:cluster_node03_address}:/srv/glusterfs/postgresql - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/prometheus.yml b/mcp/reclass/classes/system/glusterfs/server/volume/prometheus.yml deleted file mode 100644 index 144847a0b..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/prometheus.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - prometheus: - storage: /srv/glusterfs/prometheus - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/prometheus - - ${_param:cluster_node02_address}:/srv/glusterfs/prometheus - - ${_param:cluster_node03_address}:/srv/glusterfs/prometheus - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/pushkin.yml b/mcp/reclass/classes/system/glusterfs/server/volume/pushkin.yml deleted file mode 100644 index 52d393ef1..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/pushkin.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - pushkin: - storage: /srv/glusterfs/pushkin - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/pushkin - - ${_param:cluster_node02_address}:/srv/glusterfs/pushkin - - ${_param:cluster_node03_address}:/srv/glusterfs/pushkin - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/registry.yml b/mcp/reclass/classes/system/glusterfs/server/volume/registry.yml deleted file mode 100644 index 5df7d8a70..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/registry.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - registry: - storage: /srv/glusterfs/registry - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/registry - - ${_param:cluster_node02_address}:/srv/glusterfs/registry - - ${_param:cluster_node03_address}:/srv/glusterfs/registry - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/rundeck.yml b/mcp/reclass/classes/system/glusterfs/server/volume/rundeck.yml deleted file mode 100644 index 22e5563fd..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/rundeck.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - rundeck: - storage: /srv/glusterfs/rundeck - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/rundeck - - ${_param:cluster_node02_address}:/srv/glusterfs/rundeck - - ${_param:cluster_node03_address}:/srv/glusterfs/rundeck - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/salt.yml b/mcp/reclass/classes/system/glusterfs/server/volume/salt.yml deleted file mode 100644 index f87b02938..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/salt.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - saltmaster: - storage: /srv/glusterfs/saltmaster - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/saltmaster - - ${_param:cluster_node02_address}:/srv/glusterfs/saltmaster - - ${_param:cluster_node03_address}:/srv/glusterfs/saltmaster - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/salt_pki.yml b/mcp/reclass/classes/system/glusterfs/server/volume/salt_pki.yml deleted file mode 100644 index 7af39daab..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/salt_pki.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - salt_pki: - storage: /srv/glusterfs/salt_pki - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/salt_pki - - ${_param:cluster_node02_address}:/srv/glusterfs/salt_pki - - ${_param:cluster_node03_address}:/srv/glusterfs/salt_pki - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/glusterfs/server/volume/security_monkey.yml b/mcp/reclass/classes/system/glusterfs/server/volume/security_monkey.yml deleted file mode 100644 index 478aec3af..000000000 --- a/mcp/reclass/classes/system/glusterfs/server/volume/security_monkey.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - glusterfs: - server: - volumes: - security_monkey: - storage: /srv/glusterfs/security_monkey - replica: 3 - bricks: - - ${_param:cluster_node01_address}:/srv/glusterfs/security_monkey - - ${_param:cluster_node02_address}:/srv/glusterfs/security_monkey - - ${_param:cluster_node03_address}:/srv/glusterfs/security_monkey - options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On - diagnostics.client-log-level: WARNING - diagnostics.brick-log-level: WARNING diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/aptly.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/aptly.yml deleted file mode 100644 index fb24c1f0d..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/aptly.yml +++ /dev/null @@ -1,55 +0,0 @@ -parameters: - _param: - haproxy_aptly_api_bind_host: ${_param:haproxy_bind_address} - haproxy_aptly_api_bind_port: 8084 - haproxy_aptly_public_bind_host: ${_param:haproxy_bind_address} - haproxy_aptly_public_bind_port: 8085 - haproxy: - proxy: - listen: - aptly-api: - mode: http - options: - - forwardfor - - httpclose - - httplog - balance: source - binds: - - address: ${_param:haproxy_aptly_api_bind_host} - port: ${_param:haproxy_aptly_api_bind_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 18084 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 18084 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 18084 - params: backup check - aptly-public: - mode: http - options: - - forwardfor - - httpclose - - httplog - balance: source - binds: - - address: ${_param:haproxy_aptly_public_bind_host} - port: ${_param:haproxy_aptly_public_bind_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 18085 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 18085 - params: check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 18085 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/gerrit.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/gerrit.yml deleted file mode 100644 index 51d494b61..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/gerrit.yml +++ /dev/null @@ -1,58 +0,0 @@ -parameters: - _param: - haproxy_gerrit_bind_host: ${_param:haproxy_bind_address} - haproxy_gerrit_bind_port: 8080 - haproxy_gerrit_ssh_bind_host: ${_param:haproxy_gerrit_bind_host} - haproxy_gerrit_ssh_bind_port: 29418 - haproxy_gerrit_ssl: - enabled: false - haproxy: - proxy: - listen: - gerrit: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - http_request: - - action: "add-header X-Forwarded-Proto https" - condition: "if { ssl_fc }" - binds: - - address: ${_param:haproxy_gerrit_bind_host} - port: ${_param:haproxy_gerrit_bind_port} - ssl: ${_param:haproxy_gerrit_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 18083 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 18083 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 18083 - params: backup check - gerrit_ssh: - mode: tcp - balance: source - binds: - - address: ${_param:haproxy_gerrit_ssh_bind_host} - port: ${_param:haproxy_gerrit_ssh_bind_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 29417 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 29417 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 29417 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/jenkins.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/jenkins.yml deleted file mode 100644 index eda12f84e..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/cicd/jenkins.yml +++ /dev/null @@ -1,60 +0,0 @@ -parameters: - _param: - haproxy_jenkins_bind_host: ${_param:haproxy_bind_address} - haproxy_jenkins_bind_port: 8081 - haproxy_jenkins_jnlp_bind_host: ${_param:haproxy_jenkins_bind_host} - haproxy_jenkins_jnlp_bind_port: 50000 - haproxy_jenkins_ssl: - enabled: false - haproxy: - proxy: - listen: - jenkins: - mode: http - options: - - forwardfor -# - httpchk - - httpclose - - httplog - balance: source - http_request: - - action: "add-header X-Forwarded-Proto https" - condition: "if { ssl_fc }" - http_response: - - action: "del-header X-Frame-Options" - binds: - - address: ${_param:haproxy_jenkins_bind_host} - port: ${_param:haproxy_jenkins_bind_port} - ssl: ${_param:haproxy_jenkins_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 18081 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 18081 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 18081 - params: backup check - jenkins_jnlp: - mode: tcp - balance: source - binds: - - address: ${_param:haproxy_jenkins_jnlp_bind_host} - port: ${_param:haproxy_jenkins_jnlp_bind_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 50001 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 50001 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 50001 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/docker/registry.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/docker/registry.yml deleted file mode 100644 index 8d45e971f..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/docker/registry.yml +++ /dev/null @@ -1,36 +0,0 @@ -parameters: - _param: - haproxy_docker_registry_listen_host: ${_param:haproxy_bind_address} - haproxy_docker_registry_listen_port: 5000 - haproxy_docker_registry_ssl: - enabled: false - haproxy: - proxy: - listen: - registry: - mode: http - options: - - forwardfor - - httpclose - - httplog - balance: source - http_request: - - action: "add-header X-Forwarded-Proto https" - condition: "if { ssl_fc }" - binds: - - address: ${_param:haproxy_docker_registry_listen_host} - port: ${_param:haproxy_docker_registry_listen_port} - ssl: ${_param:haproxy_docker_registry_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 15000 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 15000 - params: check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 15000 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/docker/visualizer.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/docker/visualizer.yml deleted file mode 100644 index 409815c4d..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/docker/visualizer.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - haproxy_docker_visualizer_listen_port: 8091 - haproxy: - proxy: - listen: - visualizer: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - binds: - - address: ${_param:haproxy_bind_address} - port: ${_param:haproxy_docker_visualizer_listen_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 18090 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 18090 - params: check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 18090 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/elasticsearch.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/elasticsearch.yml deleted file mode 100644 index cb1a8e5ec..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/elasticsearch.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - elasticsearch: - mode: http - service_name: elasticsearch - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: roundrobin - binds: - - address: ${_param:cluster_vip_address} - port: 9200 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 9200 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 9200 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 9200 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/kibana.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/kibana.yml deleted file mode 100644 index a2180cb25..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/kibana.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - kibana: - mode: http - service_name: kibana - options: - - forwardfor -# - httpchk - - httpclose - - httplog - balance: source - binds: - - address: ${_param:cluster_vip_address} - port: 80 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 5601 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 5601 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 5601 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver.yml deleted file mode 100644 index a45a71a75..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver.yml +++ /dev/null @@ -1,24 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - k8s_secure: - type: kubernetes - options: - - ssl-hello-chk - binds: - - address: ${_param:cluster_vip_address} - port: 443 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 443 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 443 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 443 - params: check
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml deleted file mode 100644 index a365c5190..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml +++ /dev/null @@ -1,40 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - k8s_cluster: - type: kubernetes - binds: - - address: ${_param:cluster_vip_address} - port: 8080 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8080 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 8080 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 8080 - params: check - k8s_cluster_localhost: - type: kubernetes - binds: - - address: localhost - port: 8080 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8080 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 8080 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 8080 - params: check
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/etcd.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/etcd.yml deleted file mode 100644 index c31419165..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/kubernetes/etcd.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - etcd_cluster: - type: etcd - binds: - - address: ${_param:cluster_vip_address} - port: 4001 - servers: - - name: etc01 - host: ${_param:cluster_node01_address} - port: 4001 - params: check - - name: etc02 - host: ${_param:cluster_node02_address} - port: 4001 - params: backup check - - name: etc03 - host: ${_param:cluster_node03_address} - port: 4001 - params: backup check
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/logging.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/logging.yml deleted file mode 100644 index 48a4b5ce5..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/logging.yml +++ /dev/null @@ -1,6 +0,0 @@ -classes: - - service.haproxy.proxy.single - - service.haproxy.proxy.stats - # Services - - system.haproxy.proxy._kibana - - system.haproxy.proxy._elasticsearch diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/monitoring.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/monitoring.yml deleted file mode 100644 index a59d84ac8..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/monitoring.yml +++ /dev/null @@ -1,8 +0,0 @@ -classes: - - service.haproxy.proxy.single - - service.haproxy.proxy.stats - # Services - - system.haproxy.proxy._rabbitmq - - system.haproxy.proxy._uchiwa - - system.haproxy.proxy._sensu - - system.haproxy.proxy._redis diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/mysql.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/mysql.yml deleted file mode 100644 index a7ef9105b..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/mysql.yml +++ /dev/null @@ -1,26 +0,0 @@ -parameters: - _param: - haproxy_mysql_bind_port: 3306 - haproxy_mysql_source_port: 3306 - haproxy: - proxy: - listen: - mysql: - mode: tcp - balance: source - binds: - - address: ${_param:haproxy_bind_address} - port: ${_param:haproxy_mysql_bind_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: ${_param:haproxy_mysql_source_port} - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: ${_param:haproxy_mysql_source_port} - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: ${_param:haproxy_mysql_source_port} - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/analytics.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/analytics.yml deleted file mode 100644 index fd20277dd..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/analytics.yml +++ /dev/null @@ -1,53 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - contrail_analytics: - type: contrail-analytics - service_name: contrail - binds: - - address: ${_param:cluster_vip_address} - port: 8081 - servers: - - name: nal01 - host: ${_param:cluster_node01_address} - port: 9081 - params: check inter 2000 rise 2 fall 3 - - name: nal02 - host: ${_param:cluster_node02_address} - port: 9081 - params: check inter 2000 rise 2 fall 3 - - name: nal03 - host: ${_param:cluster_node03_address} - port: 9081 - params: check inter 2000 rise 2 fall 3 - contrail_config_stats: - type: contrail-config - service_name: contrail - check: false - format: listen - binds: - - address: '*' - port: 5937 - user: haproxy - password: ${_param:opencontrail_stats_password} - contrail_openstack_stats: - type: contrail-config - service_name: contrail - check: false - format: listen - binds: - - address: '*' - port: 5936 - user: haproxy - password: ${_param:opencontrail_stats_password} - contrail_collector_stats: - type: contrail-config - service_name: contrail - check: false - format: listen - binds: - - address: '*' - port: 5938 - user: haproxy - password: ${_param:opencontrail_stats_password} diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/control.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/control.yml deleted file mode 100644 index c38968275..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/opencontrail/control.yml +++ /dev/null @@ -1,69 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - contrail_api: - type: contrail-api - service_name: contrail - binds: - - address: ${_param:cluster_vip_address} - port: 8082 - servers: - - name: ntw01 - host: ${_param:cluster_node01_address} - port: 9100 - params: check inter 2000 rise 2 fall 3 - - name: ntw02 - host: ${_param:cluster_node02_address} - port: 9100 - params: check inter 2000 rise 2 fall 3 - - name: ntw03 - host: ${_param:cluster_node03_address} - port: 9100 - params: check inter 2000 rise 2 fall 3 - contrail_discovery: - type: contrail-api - service_name: contrail - binds: - - address: ${_param:cluster_vip_address} - port: 5998 - servers: - - name: ntw01 - host: ${_param:cluster_node01_address} - port: 9110 - params: check inter 2000 rise 2 fall 3 - - name: ntw02 - host: ${_param:cluster_node02_address} - port: 9110 - params: check inter 2000 rise 2 fall 3 - - name: ntw03 - host: ${_param:cluster_node03_address} - port: 9110 - params: check inter 2000 rise 2 fall 3 - contrail_config_stats: - type: contrail-config - check: false - format: listen - binds: - - address: '*' - port: 5937 - user: haproxy - password: ${_param:opencontrail_stats_password} - contrail_openstack_stats: - type: contrail-config - check: false - format: listen - binds: - - address: '*' - port: 5936 - user: haproxy - password: ${_param:opencontrail_stats_password} - contrail_collector_stats: - type: contrail-config - check: false - format: listen - binds: - - address: '*' - port: 5938 - user: haproxy - password: ${_param:opencontrail_stats_password} diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openldap.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openldap.yml deleted file mode 100644 index b6f79a039..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openldap.yml +++ /dev/null @@ -1,46 +0,0 @@ -parameters: - _param: - haproxy_openldap_bind_host: ${_param:haproxy_bind_address} - haproxy_openldap_bind_port: 389 - haproxy_openldap_ssl_bind_port: 636 - haproxy: - proxy: - listen: - openldap: - mode: tcp - balance: source - binds: - - address: ${_param:haproxy_openldap_bind_host} - port: ${_param:haproxy_openldap_bind_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 1389 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 1389 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 1389 - params: backup check - openldap_ssl: - mode: tcp - balance: source - binds: - - address: ${_param:haproxy_openldap_bind_host} - port: ${_param:haproxy_openldap_ssl_bind_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 1636 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 1636 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 1636 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml deleted file mode 100644 index 6b024aa2f..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/aodh.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - aodh-api: - type: openstack-service - service_name: aodh - binds: - - address: ${_param:cluster_vip_address} - port: 8042 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8042 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8042 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8042 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml deleted file mode 100644 index 68eef43c6..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/ceilometer.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - ceilometer_api: - type: general-service - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8777 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8777 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 8777 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 8777 - params: check
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml deleted file mode 100644 index a693e6e21..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/cinder.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - cinder_api: - type: openstack-service - service_name: cinder - binds: - - address: ${_param:cluster_vip_address} - port: 8776 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8776 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8776 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8776 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml deleted file mode 100644 index 7a54af27d..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/designate.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - designate_api: - type: openstack-service - service_name: designate - binds: - - address: ${_param:cluster_vip_address} - port: 9001 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 9001 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 9001 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml deleted file mode 100644 index 254dc3b03..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/galera.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - haproxy: - proxy: - timeout: - queue: '10s' - connect: '10s' - client: '10s' - server: '10s' - check: '10s' - listen: - mysql_cluster: - type: mysql - service_name: mysql - binds: - - address: ${_param:cluster_vip_address} - port: 3306 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 3306 - params: check inter 20s fastinter 2s downinter 2s rise 3 fall 3 - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 3306 - params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3 - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 3306 - params: backup check inter 20s fastinter 2s downinter 2s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml deleted file mode 100644 index 729cc5b69..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glance.yml +++ /dev/null @@ -1,42 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - glance_api: - type: openstack-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9292 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9292 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9292 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9292 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - glance_registry_api: - type: general-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9191 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9191 - params: check - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9191 - params: check - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9191 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml deleted file mode 100644 index a98427511..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/glare.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - glare: - type: general-service - service_name: glare - binds: - - address: ${_param:cluster_vip_address} - port: 9494 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9494 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9494 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9494 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml deleted file mode 100644 index 440a018b2..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/heat.yml +++ /dev/null @@ -1,61 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - heat_cloudwatch_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - heat_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8004 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8004 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8004 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8004 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - heat_cfn_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8003 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8003 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8003 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml deleted file mode 100644 index 9bf838cd7..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/horizon.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - horizon_web: - type: general-service - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8078 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8078 - params: check - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8078 - params: check - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8078 - params: check
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml deleted file mode 100644 index 17e537ecf..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/keystone.yml +++ /dev/null @@ -1,42 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - keystone_public_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 5000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 5000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 5000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 5000 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - keystone_admin_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 35357 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 35357 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 35357 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 35357 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml deleted file mode 100644 index 0427820ba..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/murano.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - murano_api: - type: openstack-service - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8082 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8082 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 8082
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml deleted file mode 100644 index 1f8b4d596..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/neutron.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - neutron_api: - type: openstack-service - service_name: neutron - binds: - - address: ${_param:cluster_vip_address} - port: 9696 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml deleted file mode 100644 index e3b72b7dc..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova-placement.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - nova_placement_api: - mode: http - binds: - - address: ${_param:cluster_vip_address} - port: 8778 - options: - - httpclose - - httplog - health-check: - http: - options: - - expect status 401 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8778 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8778 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8778 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml deleted file mode 100644 index 3865a822c..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/nova.yml +++ /dev/null @@ -1,61 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - nova_ec2_api: - type: general-service - service_name: nova - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8773 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8773 - params: check - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8773 - params: check - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8773 - params: check - nova_api: - type: openstack-service - service_name: nova - binds: - - address: ${_param:cluster_vip_address} - port: 8774 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8774 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8774 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8774 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - nova_metadata_api: - type: openstack-service - binds: - - address: ${_param:cluster_vip_address} - port: 8775 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8775 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8775 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8775 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml deleted file mode 100644 index 78b7d98bd..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/novnc.yml +++ /dev/null @@ -1,25 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - nova_novnc: - type: general-service - service_name: http - check: true - binds: - - address: ${_param:cluster_vip_address} - port: 6080 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 6080 - params: check - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 6080 - params: check - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 6080 - params: check - diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml deleted file mode 100644 index 3bbf8094c..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/openstack/sahara.yml +++ /dev/null @@ -1,24 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - sahara_api: - type: openstack-service - options: - - httplog - binds: - - address: ${_param:cluster_vip_address} - port: 8386 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8386 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 8386 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 8386 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/devops_portal.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/devops_portal.yml deleted file mode 100644 index e5c25cfbd..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/devops_portal.yml +++ /dev/null @@ -1,37 +0,0 @@ -parameters: - _param: - haproxy_devops_portal_bind_host: ${_param:haproxy_bind_address} - haproxy_devops_portal_bind_port: 8800 - haproxy_devops_portal_ssl: - enabled: false - haproxy: - proxy: - listen: - devops_portal: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - http_request: - - action: "add-header X-Forwarded-Proto https" - condition: "if { ssl_fc }" - binds: - - address: ${_param:haproxy_devops_portal_bind_host} - port: ${_param:haproxy_devops_portal_bind_port} - ssl: ${_param:haproxy_devops_portal_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 18800 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 18800 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 18800 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/elasticsearch.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/elasticsearch.yml deleted file mode 100644 index 2f5d1ee40..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/elasticsearch.yml +++ /dev/null @@ -1,38 +0,0 @@ -parameters: - _param: - haproxy_elasticsearch_bind_host: ${_param:haproxy_bind_address} - haproxy_elasticsearch_bind_port: 9200 - haproxy_elasticsearch_exposed_port: 19200 - haproxy_elasticsearch_ssl: - enabled: false - haproxy: - proxy: - listen: - elasticsearch: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - http_request: - - action: "add-header X-Forwarded-Proto https" - condition: "if { ssl_fc }" - binds: - - address: ${_param:haproxy_elasticsearch_bind_host} - port: ${_param:haproxy_elasticsearch_bind_port} - ssl: ${_param:haproxy_elasticsearch_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: ${_param:haproxy_elasticsearch_exposed_port} - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: ${_param:haproxy_elasticsearch_exposed_port} - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: ${_param:haproxy_elasticsearch_exposed_port} - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/postgresql.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/postgresql.yml deleted file mode 100644 index 1bc1f44c9..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/postgresql.yml +++ /dev/null @@ -1,32 +0,0 @@ -parameters: - _param: - haproxy_postgresql_bind_host: ${_param:haproxy_bind_address} - haproxy_postgresql_bind_port: 5432 - haproxy_postgresql_exposed_port: 15432 - haproxy_postgresql_ssl: - enabled: false - haproxy: - proxy: - listen: - postgresql: - mode: tcp - balance: source - options: - - tcp-check - binds: - - address: ${_param:haproxy_postgresql_bind_host} - port: ${_param:haproxy_postgresql_bind_port} - ssl: ${_param:haproxy_postgresql_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: ${_param:haproxy_postgresql_exposed_port} - params: check port ${_param:haproxy_postgresql_exposed_port} - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: ${_param:haproxy_postgresql_exposed_port} - params: backup check port ${_param:haproxy_postgresql_exposed_port} - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: ${_param:haproxy_postgresql_exposed_port} - params: backup check port ${_param:haproxy_postgresql_exposed_port} diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/pushkin.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/pushkin.yml deleted file mode 100644 index db33352ca..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/pushkin.yml +++ /dev/null @@ -1,37 +0,0 @@ -parameters: - _param: - haproxy_pushkin_bind_host: ${_param:haproxy_bind_address} - haproxy_pushkin_bind_port: 8887 - haproxy_pushkin_exposed_port: 18887 - haproxy_pushkin_ssl: - enabled: false - haproxy: - proxy: - listen: - pushkin: - mode: http - options: - - httpchk GET /apps - balance: source - http_request: - - action: "add-header X-Forwarded-Proto https" - condition: "if { ssl_fc }" - sticks: - - http-check expect status 200 - binds: - - address: ${_param:haproxy_pushkin_bind_host} - port: ${_param:haproxy_pushkin_bind_port} - ssl: ${_param:haproxy_pushkin_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: ${_param:haproxy_pushkin_exposed_port} - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: ${_param:haproxy_pushkin_exposed_port} - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: ${_param:haproxy_pushkin_exposed_port} - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/rundeck.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/rundeck.yml deleted file mode 100644 index fbabb381d..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/rundeck.yml +++ /dev/null @@ -1,37 +0,0 @@ -parameters: - _param: - haproxy_rundeck_bind_host: ${_param:haproxy_bind_address} - haproxy_rundeck_bind_port: 4440 - haproxy_rundeck_ssl: - enabled: false - haproxy: - proxy: - listen: - rundeck: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - http_request: - - action: "add-header X-Forwarded-Proto https" - condition: "if { ssl_fc }" - binds: - - address: ${_param:haproxy_rundeck_bind_host} - port: ${_param:haproxy_rundeck_bind_port} - ssl: ${_param:haproxy_rundeck_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 14440 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 14440 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 14440 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/security_monkey.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/oss/security_monkey.yml deleted file mode 100644 index 549869996..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/oss/security_monkey.yml +++ /dev/null @@ -1,37 +0,0 @@ -parameters: - _param: - haproxy_security_monkey_bind_host: ${_param:haproxy_bind_address} - haproxy_security_monkey_bind_port: 5001 - haproxy_security_monkey_exposed_port: 15001 - haproxy_security_monkey_ssl: - enabled: false - haproxy: - proxy: - listen: - security_monkey: - mode: http - options: - - httpchk GET / - balance: source - http_request: - - action: "add-header X-Forwarded-Proto https" - condition: "if { ssl_fc }" - sticks: - - http-check expect status 404 - binds: - - address: ${_param:haproxy_security_monkey_bind_host} - port: ${_param:haproxy_security_monkey_bind_port} - ssl: ${_param:haproxy_security_monkey_ssl} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: ${_param:haproxy_security_monkey_exposed_port} - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: ${_param:haproxy_security_monkey_exposed_port} - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: ${_param:haproxy_security_monkey_exposed_port} - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/phpldapadmin.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/phpldapadmin.yml deleted file mode 100644 index b2b7f93da..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/phpldapadmin.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - haproxy_phpldapadmin_bind_host: ${_param:haproxy_bind_address} - haproxy_phpldapadmin_bind_port: 8089 - haproxy: - proxy: - listen: - phpldapadmin: - mode: http - options: - - forwardfor - - httpclose - - httplog - balance: source - binds: - - address: ${_param:haproxy_phpldapadmin_bind_host} - port: ${_param:haproxy_phpldapadmin_bind_port} - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 18089 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 18089 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 18089 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/rabbitmq.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/rabbitmq.yml deleted file mode 100644 index 83992dd11..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/rabbitmq.yml +++ /dev/null @@ -1,34 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - rabbitmq: - type: rabbitmq - service_name: rabbitmq - binds: - - address: ${_param:cluster_vip_address} - port: 5672 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 5672 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 5672 - params: backup check - rabbitmq_management: - type: rabbitmq - service_name: rabbitmq - binds: - - address: ${_param:cluster_vip_address} - port: 15672 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 15672 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 15672 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/radosgw.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/radosgw.yml deleted file mode 100644 index 369306ba4..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/radosgw.yml +++ /dev/null @@ -1,26 +0,0 @@ -parameters: - _param: - haproxy_radosgw_bind_port: 8080 - haproxy_radosgw_source_port: 8080 - haproxy: - proxy: - listen: - radosgw: - mode: tcp - balance: source - binds: - - address: ${_param:cluster_vip_address} - port: ${_param:haproxy_radosgw_bind_port} - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: ${_param:haproxy_radosgw_source_port} - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: ${_param:haproxy_radosgw_source_port} - params: backup check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: ${_param:haproxy_radosgw_source_port} - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/redis.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/redis.yml deleted file mode 100644 index fc4695337..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/redis.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - redis: - mode: tcp - service_name: redis - balance: source - binds: - - address: ${_param:cluster_vip_address} - port: 6379 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 6379 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 6379 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/salt.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/salt.yml deleted file mode 100644 index ba54c0740..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/salt.yml +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - salt: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - timeout: - server: 20m - client: 20m - binds: - - address: ${_param:haproxy_bind_address} - port: 8000 - servers: - - name: ${_param:cluster_node01_name} - host: ${_param:cluster_node01_address} - port: 8000 - params: check - - name: ${_param:cluster_node02_name} - host: ${_param:cluster_node02_address} - port: 8000 - params: backup check - - name: ${_param:cluster_node03_name} - host: ${_param:cluster_node03_address} - port: 8000 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/sensu.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/sensu.yml deleted file mode 100644 index 739916cf1..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/sensu.yml +++ /dev/null @@ -1,24 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - sensu: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - binds: - - address: ${_param:cluster_vip_address} - port: 4567 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 4567 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 4567 - params: backup check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/elasticsearch.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/elasticsearch.yml deleted file mode 100644 index 531d647f0..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/elasticsearch.yml +++ /dev/null @@ -1,28 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - elasticsearch: - mode: http - options: - - httplog - - http-keep-alive - - prefer-last-server - - dontlog-normal - balance: roundrobin - binds: - - address: ${_param:cluster_vip_address} - port: 9200 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 9200 - params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3' - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 9200 - params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3' - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 9200 - params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3' diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/grafana.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/grafana.yml deleted file mode 100644 index 3f59ce268..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/grafana.yml +++ /dev/null @@ -1,26 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - grafana: - mode: http - options: - - httplog - - dontlog-normal - balance: source - binds: - - address: ${_param:cluster_vip_address} - port: ${_param:cluster_grafana_port} - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 3000 - params: 'check' - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 3000 - params: 'check' - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 3000 - params: 'check' diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/influxdb.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/influxdb.yml deleted file mode 100644 index 02e25d7b2..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/influxdb.yml +++ /dev/null @@ -1,28 +0,0 @@ -parameters: - _param: - cluster_influxdb_port: ${_param:influxdb_port} - haproxy: - proxy: - listen: - influxdb: - mode: http - options: - - "httpchk GET /ping" - - httplog - - dontlog-normal - binds: - - address: ${_param:cluster_vip_address} - port: ${_param:cluster_influxdb_port} - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8086 - params: 'check' - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 8086 - params: 'backup check' - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 8086 - params: 'backup check' diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/kibana.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/kibana.yml deleted file mode 100644 index e92e38a43..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/kibana.yml +++ /dev/null @@ -1,28 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - kibana: - mode: http - options: - - httplog - - http-keep-alive - - prefer-last-server - - dontlog-normal - balance: roundrobin - binds: - - address: ${_param:cluster_vip_address} - port: 5601 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 5601 - params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3' - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 5601 - params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3' - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 5601 - params: 'check inter 10s fastinter 2s downinter 3s rise 3 fall 3' diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/redis.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/redis.yml deleted file mode 100644 index 881e8ed9a..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/redis.yml +++ /dev/null @@ -1,32 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - redis: - mode: tcp - check: False - health-check: - tcp: - options: - - send PING\r\n - - expect string +PONG - - send info\ replication\r\n - - expect string role:master - - send QUIT\r\n - - expect string +OK - binds: - - address: ${_param:cluster_vip_address} - port: ${_param:cluster_redis_port} - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 6379 - params: 'check' - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 6379 - params: 'check' - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 6379 - params: 'check' diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/sensu.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/sensu.yml deleted file mode 100644 index 33ab5bcd4..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/sensu.yml +++ /dev/null @@ -1,28 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - sensu: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - binds: - - address: ${_param:cluster_vip_address} - port: 4567 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 4567 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 4567 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 4567 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/uchiwa.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/uchiwa.yml deleted file mode 100644 index 3bec0e82b..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/stacklight/uchiwa.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - uchiwa: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - binds: - - address: ${_param:cluster_vip_address} - port: 3001 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 3001 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 3001 - params: check - - name: ${_param:cluster_node03_hostname} - host: ${_param:cluster_node03_address} - port: 3001 - params: check - diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/stats.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/stats.yml deleted file mode 100644 index 1d093f17b..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/stats.yml +++ /dev/null @@ -1,12 +0,0 @@ -parameters: - _param: - haproxy_stats_port: 9600 - haproxy: - proxy: - listen: - stats: - type: stats - check: false - binds: - - address: ${_param:haproxy_bind_address} - port: ${_param:haproxy_stats_port} diff --git a/mcp/reclass/classes/system/haproxy/proxy/listen/uchiwa.yml b/mcp/reclass/classes/system/haproxy/proxy/listen/uchiwa.yml deleted file mode 100644 index 1f25bc49c..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/listen/uchiwa.yml +++ /dev/null @@ -1,24 +0,0 @@ -parameters: - haproxy: - proxy: - listen: - uchiwa: - mode: http - options: - - forwardfor - - httpchk - - httpclose - - httplog - balance: source - binds: - - address: ${_param:cluster_vip_address} - port: 80 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 3000 - params: check - - name: ${_param:cluster_node02_hostname} - host: ${_param:cluster_node02_address} - port: 3000 - params: check diff --git a/mcp/reclass/classes/system/haproxy/proxy/single.yml b/mcp/reclass/classes/system/haproxy/proxy/single.yml deleted file mode 100644 index dc9c6685a..000000000 --- a/mcp/reclass/classes/system/haproxy/proxy/single.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - haproxy: - proxy: - enabled: true diff --git a/mcp/reclass/classes/system/heat/client/init.yml b/mcp/reclass/classes/system/heat/client/init.yml deleted file mode 100644 index cb3ce4fcc..000000000 --- a/mcp/reclass/classes/system/heat/client/init.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - _param: - heat_data_revision: master - heat: - client: - enabled: true - source: - engine: git - address: ${_param:heat_data_repository} - revision: ${_param:heat_data_revision} diff --git a/mcp/reclass/classes/system/heat/server/cluster.yml b/mcp/reclass/classes/system/heat/server/cluster.yml deleted file mode 100644 index ee5df3361..000000000 --- a/mcp/reclass/classes/system/heat/server/cluster.yml +++ /dev/null @@ -1,60 +0,0 @@ -classes: -- service.heat.server.cluster -- service.haproxy.proxy.single -- service.keepalived.cluster.single -- system.haproxy.proxy.listen.openstack.heat -parameters: - _param: - cluster_public_protocol: https - heat: - server: - stack_domain_admin: - name: heat_domain_admin - password: ${_param:heat_domain_admin_password} - domain: heat - enabled: true - region: ${_param:openstack_region} - version: ${_param:heat_version} - bind: - api_cfn: - address: ${_param:cluster_local_address} - api_cloudwatch: - address: ${_param:cluster_local_address} - api: - address: ${_param:cluster_local_address} - database: - engine: mysql - host: ${_param:openstack_database_address} - port: 3306 - name: heat - user: heat - password: ${_param:mysql_heat_password} - metadata: - host: ${_param:cluster_public_host} - port: 8000 - protocol: ${_param:cluster_public_protocol} - waitcondition: - host: ${_param:cluster_public_host} - port: 8000 - protocol: ${_param:cluster_public_protocol} - watch: - host: ${_param:cluster_public_host} - port: 8003 - protocol: ${_param:cluster_public_protocol} - identity: - engine: keystone - host: ${_param:cluster_vip_address} - port: 35357 - tenant: service - user: heat - password: ${_param:keystone_heat_password} - message_queue: - engine: rabbitmq - port: 5672 - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} diff --git a/mcp/reclass/classes/system/heat/server/notification/cadf.yml b/mcp/reclass/classes/system/heat/server/notification/cadf.yml deleted file mode 100644 index 352e93654..000000000 --- a/mcp/reclass/classes/system/heat/server/notification/cadf.yml +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - heat: - server: - audit: - enabled: true diff --git a/mcp/reclass/classes/system/heat/server/notification/messagingv2.yml b/mcp/reclass/classes/system/heat/server/notification/messagingv2.yml deleted file mode 100644 index eff514123..000000000 --- a/mcp/reclass/classes/system/heat/server/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - heat: - server: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/heat/server/resource/contrail.yml b/mcp/reclass/classes/system/heat/server/resource/contrail.yml deleted file mode 100644 index 0b4cc56de..000000000 --- a/mcp/reclass/classes/system/heat/server/resource/contrail.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - linux: - system: - package: - contrail-heat: - version: latest - heat: - server: - dir: - plugins: - - /usr/lib/python2.7/dist-packages/vnc_api/gen/heat/resources diff --git a/mcp/reclass/classes/system/heat/server/resource/salt.yml b/mcp/reclass/classes/system/heat/server/resource/salt.yml deleted file mode 100644 index a371a3854..000000000 --- a/mcp/reclass/classes/system/heat/server/resource/salt.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - linux: - system: - package: - python-heat-salt: - version: latest - heat: - server: - dir: - plugins: - - /usr/lib/python2.7/dist-packages/heat_salt/resources diff --git a/mcp/reclass/classes/system/heat/server/single.yml b/mcp/reclass/classes/system/heat/server/single.yml deleted file mode 100644 index d09760557..000000000 --- a/mcp/reclass/classes/system/heat/server/single.yml +++ /dev/null @@ -1,9 +0,0 @@ -classes: -- service.heat.server.single -parameters: - heat: - server: - stack_domain_admin: - name: heat_domain_admin - password: ${_param:heat_domain_admin_password} - domain: heat diff --git a/mcp/reclass/classes/system/horizon/server/cluster.yml b/mcp/reclass/classes/system/horizon/server/cluster.yml deleted file mode 100644 index 8ee48a3ca..000000000 --- a/mcp/reclass/classes/system/horizon/server/cluster.yml +++ /dev/null @@ -1,16 +0,0 @@ -classes: -- service.keepalived.cluster.single -- service.horizon.server.cluster -- service.haproxy.proxy.single -- system.haproxy.proxy.listen.openstack.horizon -- system.memcached.server.single -parameters: - _param: - horizon_site_branding: "OpenStack Dashboard" - horizon: - server: - branding: ${_param:horizon_site_branding} - plugin: {} - session: - engine: "cache" - diff --git a/mcp/reclass/classes/system/horizon/server/plugin/api_mask.yml b/mcp/reclass/classes/system/horizon/server/plugin/api_mask.yml deleted file mode 100644 index 5ef5f5a20..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/api_mask.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - horizon: - server: - plugin: - api_mask: - app: api_mask - mask_url: ${_param:horizon_api_mask_url} - source: - engine: pkg - name: openstack-dashboard-api-mask diff --git a/mcp/reclass/classes/system/horizon/server/plugin/billing.yml b/mcp/reclass/classes/system/horizon/server/plugin/billing.yml deleted file mode 100644 index 9fdefdeb0..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/billing.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - _param: - openstack_billing_currency: EUR - openstack_billing_allocation: False - openstack_billing_resource_types: [] - horizon: - server: - plugin: - billing: - metric: - engine: graphite - host: ${_param:openstack_billing_address} - port: 80 - config: - currency: ${_param:openstack_billing_currency} - allocation: ${_param:openstack_billing_allocation} - extra_resource_types: ${_param:openstack_billing_resource_types} - source: - engine: pkg - name: openstack-dashboard-billing - horizon_overrides: - overrides: - - horizon_billing diff --git a/mcp/reclass/classes/system/horizon/server/plugin/contrail.yml b/mcp/reclass/classes/system/horizon/server/plugin/contrail.yml deleted file mode 100644 index 669dbb6bb..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/contrail.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - horizon: - server: - plugin: - contrail: - source: - engine: pkg - name: openstack-dashboard-contrail-panels - horizon_overrides: - overrides: - - contrail_openstack_dashboard diff --git a/mcp/reclass/classes/system/horizon/server/plugin/heat.yml b/mcp/reclass/classes/system/horizon/server/plugin/heat.yml deleted file mode 100644 index 9e7048099..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/heat.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - horizon: - server: - plugin: - heat: - source: - engine: pkg - name: openstack-dashboard-heat-server-templates - horizon_overrides: - overrides: - - heat_server_templates diff --git a/mcp/reclass/classes/system/horizon/server/plugin/jenkins.yml b/mcp/reclass/classes/system/horizon/server/plugin/jenkins.yml deleted file mode 100644 index 04c490160..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/jenkins.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - horizon_jenkins_url: http://localhost:8080/ - horizon_jenkins_user: admin - horizon: - server: - jenkins_api: - url: ${_param:horizon_jenkins_url} - user: ${_param:horizon_jenkins_user} - password: ${_param:horizon_jenkins_password} - plugin: - jenkins: - source: - engine: pkg - name: openstack-dashboard-jenkins diff --git a/mcp/reclass/classes/system/horizon/server/plugin/monitoring.yml b/mcp/reclass/classes/system/horizon/server/plugin/monitoring.yml deleted file mode 100644 index 66add9400..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/monitoring.yml +++ /dev/null @@ -1,9 +0,0 @@ -parameters: - horizon: - server: - plugin: - monitoring: - app: horizon_monitoring - source: - engine: pkg - name: openstack-dashboard-sensu diff --git a/mcp/reclass/classes/system/horizon/server/plugin/overrides.yml b/mcp/reclass/classes/system/horizon/server/plugin/overrides.yml deleted file mode 100644 index edf60b3f3..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/overrides.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - horizon: - server: - plugin: - horizon_overrides: - override: true - app: horizon_overrides - source: - engine: pkg - name: python-horizon-overrides-plugin diff --git a/mcp/reclass/classes/system/horizon/server/plugin/telemetry.yml b/mcp/reclass/classes/system/horizon/server/plugin/telemetry.yml deleted file mode 100644 index a9441118e..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/telemetry.yml +++ /dev/null @@ -1,21 +0,0 @@ -parameters: - _param: - horizon_telemetry_engine: graphite - horizon_telemetry_host: 127.0.0.1 - horizon_telemetry_port: 80 - horizon_telemetry_control_nodes: {} - horizon: - server: - control_nodes: ${_param:horizon_telemetry_control_nodes} - plugin: - telemetry: - metric: - engine: ${_param:horizon_telemetry_engine} - host: ${_param:horizon_telemetry_host} - port: ${_param:horizon_telemetry_port} - source: - engine: pkg - name: openstack-dashboard-telemetry - horizon_overrides: - overrides: - - horizon_telemetry diff --git a/mcp/reclass/classes/system/horizon/server/plugin/theme.yml b/mcp/reclass/classes/system/horizon/server/plugin/theme.yml deleted file mode 100644 index 85475d754..000000000 --- a/mcp/reclass/classes/system/horizon/server/plugin/theme.yml +++ /dev/null @@ -1,12 +0,0 @@ -parameters: - _param: - horizon_dashboard_theme: mirantis - horizon: - server: - plugin: - horizon_theme: - app: horizon_theme - theme_name: ${_param:horizon_dashboard_theme} - source: - engine: pkg - name: openstack-dashboard-${_param:horizon_dashboard_theme}-theme diff --git a/mcp/reclass/classes/system/horizon/server/single.yml b/mcp/reclass/classes/system/horizon/server/single.yml deleted file mode 100644 index 2b59f5218..000000000 --- a/mcp/reclass/classes/system/horizon/server/single.yml +++ /dev/null @@ -1,16 +0,0 @@ -classes: -- service.horizon.server.single -- system.memcached.server.single -parameters: - _param: - horizon_site_branding: "OpenStack Dashboard" - horizon: - server: - branding: ${_param:horizon_site_branding} - bind: - address: 0.0.0.0 - port: 8078 - plugin: {} - session: - engine: "cache" - diff --git a/mcp/reclass/classes/system/keepalived/cluster/instance/cicd_control_vip.yml b/mcp/reclass/classes/system/keepalived/cluster/instance/cicd_control_vip.yml deleted file mode 100644 index ab7f413fc..000000000 --- a/mcp/reclass/classes/system/keepalived/cluster/instance/cicd_control_vip.yml +++ /dev/null @@ -1,15 +0,0 @@ -applications: - - keepalived -classes: - - service.keepalived.support -parameters: - keepalived: - cluster: - enabled: true - instance: - cicd_control_vip: - address: ${_param:cluster_vip_address} - password: ${_param:keepalived_vip_password} - interface: ${_param:keepalived_vip_interface} - virtual_router_id: ${_param:keepalived_vip_virtual_router_id} - priority: ${_param:keepalived_vip_priority} diff --git a/mcp/reclass/classes/system/keepalived/cluster/instance/openstack_telemetry_vip.yml b/mcp/reclass/classes/system/keepalived/cluster/instance/openstack_telemetry_vip.yml deleted file mode 100644 index 91155e74f..000000000 --- a/mcp/reclass/classes/system/keepalived/cluster/instance/openstack_telemetry_vip.yml +++ /dev/null @@ -1,19 +0,0 @@ -applications: -- keepalived -classes: -- service.keepalived.support -parameters: - _param: - keepalived_openstack_telemetry_vip_address: ${_param:cluster_vip_address} - keepalived_openstack_telemetry_vip_password: password - keepalived_openstack_telemetry_vip_interface: eth1 - keepalived: - cluster: - enabled: true - instance: - openstack_telemetry_vip: - address: ${_param:keepalived_openstack_telemetry_vip_address} - password: ${_param:keepalived_openstack_telemetry_vip_password} - interface: ${_param:keepalived_openstack_telemetry_vip_interface} - virtual_router_id: 230 - priority: 101 diff --git a/mcp/reclass/classes/system/keepalived/cluster/instance/openstack_web_public_vip.yml b/mcp/reclass/classes/system/keepalived/cluster/instance/openstack_web_public_vip.yml deleted file mode 100644 index 8279b65a5..000000000 --- a/mcp/reclass/classes/system/keepalived/cluster/instance/openstack_web_public_vip.yml +++ /dev/null @@ -1,19 +0,0 @@ -applications: -- keepalived -classes: -- service.keepalived.support -parameters: - _param: - keepalived_openstack_web_public_vip_address: ${_param:cluster_vip_address} - keepalived_openstack_web_public_vip_password: password - keepalived_openstack_web_public_vip_interface: eth1 - keepalived: - cluster: - enabled: true - instance: - openstack_web_public_vip: - address: ${_param:keepalived_openstack_web_public_vip_address} - password: ${_param:keepalived_openstack_web_public_vip_password} - interface: ${_param:keepalived_openstack_web_public_vip_interface} - virtual_router_id: 132 - priority: ${_param:keepalived_vip_priority} diff --git a/mcp/reclass/classes/system/keepalived/cluster/instance/prometheus_server_vip.yml b/mcp/reclass/classes/system/keepalived/cluster/instance/prometheus_server_vip.yml deleted file mode 100644 index 7bde70258..000000000 --- a/mcp/reclass/classes/system/keepalived/cluster/instance/prometheus_server_vip.yml +++ /dev/null @@ -1,18 +0,0 @@ -applications: -- keepalived -classes: -- service.keepalived.support -parameters: - _param: - keepalived_vip_priority: 101 - keepalived: - cluster: - enabled: true - instance: - prometheus_server_vip: - address: ${_param:keepalived_prometheus_vip_address} - password: ${_param:keepalived_prometheus_vip_password} - interface: ${_param:keepalived_prometheus_vip_interface} - virtual_router_id: 105 - priority: ${_param:keepalived_vip_priority} - diff --git a/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_log_vip.yml b/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_log_vip.yml deleted file mode 100644 index caa67548c..000000000 --- a/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_log_vip.yml +++ /dev/null @@ -1,15 +0,0 @@ -applications: -- keepalived -classes: -- service.keepalived.support -parameters: - keepalived: - cluster: - enabled: true - instance: - stacklight_log_vip: - address: ${_param:keepalived_stacklight_log_vip_address} - password: ${_param:keepalived_stacklight_log_vip_password} - interface: ${_param:keepalived_stacklight_log_vip_interface} - virtual_router_id: 110 - priority: 101 diff --git a/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_monitor_vip.yml b/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_monitor_vip.yml deleted file mode 100644 index 28a6b6923..000000000 --- a/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_monitor_vip.yml +++ /dev/null @@ -1,15 +0,0 @@ -applications: -- keepalived -classes: -- service.keepalived.support -parameters: - keepalived: - cluster: - enabled: true - instance: - stacklight_monitor_vip: - address: ${_param:keepalived_stacklight_monitor_vip_address} - password: ${_param:keepalived_stacklight_monitor_vip_password} - interface: ${_param:keepalived_stacklight_monitor_vip_interface} - virtual_router_id: 100 - priority: 101 diff --git a/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_telemetry_vip.yml b/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_telemetry_vip.yml deleted file mode 100644 index e7d31a50a..000000000 --- a/mcp/reclass/classes/system/keepalived/cluster/instance/stacklight_telemetry_vip.yml +++ /dev/null @@ -1,15 +0,0 @@ -applications: -- keepalived -classes: -- service.keepalived.support -parameters: - keepalived: - cluster: - enabled: true - instance: - stacklight_telemetry_vip: - address: ${_param:keepalived_stacklight_telemetry_vip_address} - password: ${_param:keepalived_stacklight_telemetry_vip_password} - interface: ${_param:keepalived_stacklight_telemetry_vip_interface} - virtual_router_id: 120 - priority: 101 diff --git a/mcp/reclass/classes/system/keystone/client/service/aodh.yml b/mcp/reclass/classes/system/keystone/client/service/aodh.yml deleted file mode 100644 index 51de0ca89..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/aodh.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - aodh: - is_admin: true - password: ${_param:keystone_aodh_password} - email: ${_param:admin_email} - service: - aodh: - type: alarming - description: OpenStack Alarming Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8042 - public_path: '/' - internal_address: ${_param:aodh_service_host} - internal_port: 8042 - internal_path: '/' - admin_address: ${_param:aodh_service_host} - admin_port: 8042 - admin_path: '/' diff --git a/mcp/reclass/classes/system/keystone/client/service/billometer.yml b/mcp/reclass/classes/system/keystone/client/service/billometer.yml deleted file mode 100644 index 3728aa54c..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/billometer.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - billometer: - is_admin: true - password: ${_param:keystone_billometer_password} - email: ${_param:admin_email} - service: - billometer: - type: billing - description: OpenStack Billing Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 9753 - public_path: '/v1' - internal_address: ${_param:billometer_service_host} - internal_port: 9753 - internal_path: '/v1' - admin_address: ${_param:billometer_service_host} - admin_port: 9753 - admin_path: '/v1' diff --git a/mcp/reclass/classes/system/keystone/client/service/ceilometer.yml b/mcp/reclass/classes/system/keystone/client/service/ceilometer.yml deleted file mode 100644 index 4c59f80f3..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/ceilometer.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - ceilometer: - is_admin: true - password: ${_param:keystone_ceilometer_password} - email: ${_param:admin_email} - service: - ceilometer: - type: metering - description: OpenStack Telemetry Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8777 - public_path: '/' - internal_address: ${_param:ceilometer_service_host} - internal_port: 8777 - internal_path: '/' - admin_address: ${_param:ceilometer_service_host} - admin_port: 8777 - admin_path: '/' diff --git a/mcp/reclass/classes/system/keystone/client/service/cinder.yml b/mcp/reclass/classes/system/keystone/client/service/cinder.yml deleted file mode 100644 index ffb55102a..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/cinder.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - cinder: - is_admin: true - password: ${_param:keystone_cinder_password} - email: ${_param:admin_email} - service: - cinder: - type: volume - description: OpenStack Volume Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8776 - public_path: '/v1/$(project_id)s' - internal_address: ${_param:cinder_service_host} - internal_port: 8776 - internal_path: '/v1/$(project_id)s' - admin_address: ${_param:cinder_service_host} - admin_port: 8776 - admin_path: '/v1/$(project_id)s' diff --git a/mcp/reclass/classes/system/keystone/client/service/cinder2.yml b/mcp/reclass/classes/system/keystone/client/service/cinder2.yml deleted file mode 100644 index e0e2636c5..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/cinder2.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - cinder: - is_admin: true - password: ${_param:keystone_cinder_password} - email: ${_param:admin_email} - service: - cinderv2: - type: volumev2 - description: OpenStack Volume Service v2 - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8776 - public_path: '/v2/$(project_id)s' - internal_address: ${_param:cinder_service_host} - internal_port: 8776 - internal_path: '/v2/$(project_id)s' - admin_address: ${_param:cinder_service_host} - admin_port: 8776 - admin_path: '/v2/$(project_id)s' diff --git a/mcp/reclass/classes/system/keystone/client/service/cinder3.yml b/mcp/reclass/classes/system/keystone/client/service/cinder3.yml deleted file mode 100644 index 43a805cf3..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/cinder3.yml +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - cinder: - is_admin: true - password: ${_param:keystone_cinder_password} - email: ${_param:admin_email} - service: - cinderv3: - type: volumev3 - description: OpenStack Volume Service v3 - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8776 - public_path: '/v3/$(project_id)s' - internal_address: ${_param:cinder_service_host} - internal_port: 8776 - internal_path: '/v3/$(project_id)s' - admin_address: ${_param:cinder_service_host} - admin_port: 8776 - admin_path: '/v3/$(project_id)s' - diff --git a/mcp/reclass/classes/system/keystone/client/service/designate.yml b/mcp/reclass/classes/system/keystone/client/service/designate.yml deleted file mode 100644 index 4018712c7..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/designate.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - designate: - is_admin: true - password: ${_param:keystone_designate_password} - email: ${_param:admin_email} - service: - designate: - type: dns - description: OpenStack DNS service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 9001 - public_path: '/' - internal_address: ${_param:designate_service_host} - internal_port: 9001 - internal_path: '/' - admin_address: ${_param:designate_service_host} - admin_port: 9001 - admin_path: '/' diff --git a/mcp/reclass/classes/system/keystone/client/service/glance.yml b/mcp/reclass/classes/system/keystone/client/service/glance.yml deleted file mode 100644 index 365917b9f..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/glance.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - glance: - is_admin: true - password: ${_param:keystone_glance_password} - email: ${_param:admin_email} - service: - glance: - type: image - description: OpenStack Image Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 9292 - public_path: '' - internal_address: ${_param:glance_service_host} - internal_port: 9292 - internal_path: '' - admin_address: ${_param:glance_service_host} - admin_port: 9292 - admin_path: '' diff --git a/mcp/reclass/classes/system/keystone/client/service/glare.yml b/mcp/reclass/classes/system/keystone/client/service/glare.yml deleted file mode 100644 index 78c7d1f8d..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/glare.yml +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - glance: - is_admin: true - password: ${_param:keystone_glance_password} - email: ${_param:admin_email} - service: - glare: - type: artifact - description: OpenStack Image Artifact Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 9494 - public_path: '' - internal_address: ${_param:glance_service_host} - internal_port: 9494 - internal_path: '' - admin_address: ${_param:glance_service_host} - admin_port: 9494 - admin_path: '' - diff --git a/mcp/reclass/classes/system/keystone/client/service/heat-cfn.yml b/mcp/reclass/classes/system/keystone/client/service/heat-cfn.yml deleted file mode 100644 index 343ff461d..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/heat-cfn.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - service: - heat-cfn: - type: cloudformation - description: OpenStack CloudFormation Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8000 - public_path: '/v1' - internal_address: ${_param:heat_service_host} - internal_port: 8000 - internal_path: '/v1' - admin_address: ${_param:heat_service_host} - admin_port: 8000 - admin_path: '/v1' diff --git a/mcp/reclass/classes/system/keystone/client/service/heat.yml b/mcp/reclass/classes/system/keystone/client/service/heat.yml deleted file mode 100644 index d7eadd543..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/heat.yml +++ /dev/null @@ -1,33 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - roles: - - heat_stack_user - - heat_stack_owner - project: - service: - user: - heat: - is_admin: true - password: ${_param:keystone_heat_password} - email: ${_param:admin_email} - service: - heat: - type: orchestration - description: OpenStack Orchestration Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8004 - public_path: '/v1/%(project_id)s' - internal_address: ${_param:heat_service_host} - internal_port: 8004 - internal_path: '/v1/%(project_id)s' - admin_address: ${_param:heat_service_host} - admin_port: 8004 - admin_path: '/v1/%(project_id)s' diff --git a/mcp/reclass/classes/system/keystone/client/service/keystone.yml b/mcp/reclass/classes/system/keystone/client/service/keystone.yml deleted file mode 100644 index af3acfca2..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/keystone.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - service: - keystone: - type: identity - description: OpenStack Identity Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 5000 - public_path: '/v2.0' - internal_address: ${_param:keystone_service_host} - internal_port: 5000 - internal_path: '/v2.0' - admin_address: ${_param:keystone_service_host} - admin_port: 35357 - admin_path: '/v2.0' diff --git a/mcp/reclass/classes/system/keystone/client/service/keystone3.yml b/mcp/reclass/classes/system/keystone/client/service/keystone3.yml deleted file mode 100644 index 9dd9eef6e..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/keystone3.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - service: - keystone3: - type: identity - description: OpenStack Identity Service v3 - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 5000 - public_path: '/v3' - internal_address: ${_param:keystone_service_host} - internal_port: 5000 - internal_path: '/v3' - admin_address: ${_param:keystone_service_host} - admin_port: 35357 - admin_path: '/v3' diff --git a/mcp/reclass/classes/system/keystone/client/service/murano.yml b/mcp/reclass/classes/system/keystone/client/service/murano.yml deleted file mode 100644 index 5e6503885..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/murano.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - murano: - is_admin: true - password: ${_param:keystone_murano_password} - email: ${_param:admin_email} - service: - murano: - type: application-catalog - description: Application Catalog for OpenStack - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8082 - public_path: '' - internal_address: ${_param:murano_service_host} - internal_port: 8082 - internal_path: '' - admin_address: ${_param:murano_service_host} - admin_port: 8082 - admin_path: '' diff --git a/mcp/reclass/classes/system/keystone/client/service/neutron.yml b/mcp/reclass/classes/system/keystone/client/service/neutron.yml deleted file mode 100644 index 12fe9fe17..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/neutron.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - neutron: - is_admin: true - password: ${_param:keystone_neutron_password} - email: ${_param:admin_email} - service: - neutron: - type: network - description: OpenStack Networking Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 9696 - public_path: '/' - internal_address: ${_param:neutron_service_host} - internal_port: 9696 - internal_path: '/' - admin_address: ${_param:neutron_service_host} - admin_port: 9696 - admin_path: '/' diff --git a/mcp/reclass/classes/system/keystone/client/service/nova-ec2.yml b/mcp/reclass/classes/system/keystone/client/service/nova-ec2.yml deleted file mode 100644 index 586701cb0..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/nova-ec2.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - service: - nova-ec2: - type: ec2 - description: OpenStack EC2 Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8773 - public_path: '/services/Cloud' - internal_address: ${_param:nova_service_host} - internal_port: 8773 - internal_path: '/services/Cloud' - admin_address: ${_param:nova_service_host} - admin_port: 8773 - admin_path: '/services/Admin' diff --git a/mcp/reclass/classes/system/keystone/client/service/nova-placement.yml b/mcp/reclass/classes/system/keystone/client/service/nova-placement.yml deleted file mode 100644 index 61b54550d..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/nova-placement.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - service: - placement: - type: placement - description: OpenStack Placement API - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: '8778' - public_path: '' - internal_address: ${_param:nova_service_host} - internal_port: '8778' - internal_path: '' - admin_address: ${_param:nova_service_host} - admin_port: '8778' - admin_path: '' diff --git a/mcp/reclass/classes/system/keystone/client/service/nova.yml b/mcp/reclass/classes/system/keystone/client/service/nova.yml deleted file mode 100644 index a0d698ba7..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/nova.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - nova: - is_admin: true - password: ${_param:keystone_nova_password} - email: ${_param:admin_email} - service: - nova: - type: compute - description: OpenStack Compute Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8774 - public_path: '/v2/$(project_id)s' - internal_address: ${_param:nova_service_host} - internal_port: 8774 - internal_path: '/v2/$(project_id)s' - admin_address: ${_param:nova_service_host} - admin_port: 8774 - admin_path: '/v2/$(project_id)s' diff --git a/mcp/reclass/classes/system/keystone/client/service/nova21.yml b/mcp/reclass/classes/system/keystone/client/service/nova21.yml deleted file mode 100644 index 328aefd7c..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/nova21.yml +++ /dev/null @@ -1,45 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - nova: - is_admin: true - password: ${_param:keystone_nova_password} - email: ${_param:admin_email} - service: - nova20: - type: compute_legacy - description: OpenStack Compute Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8774 - public_path: '/v2/$(project_id)s' - internal_address: ${_param:nova_service_host} - internal_port: 8774 - internal_path: '/v2/$(project_id)s' - admin_address: ${_param:nova_service_host} - admin_port: 8774 - admin_path: '/v2/$(project_id)s' - nova: - type: compute - description: OpenStack Compute Service v2.1 - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8774 - public_path: '/v2.1/$(project_id)s' - internal_address: ${_param:nova_service_host} - internal_port: 8774 - internal_path: '/v2.1/$(project_id)s' - admin_address: ${_param:nova_service_host} - admin_port: 8774 - admin_path: '/v2.1/$(project_id)s' diff --git a/mcp/reclass/classes/system/keystone/client/service/radosgw-s3.yml b/mcp/reclass/classes/system/keystone/client/service/radosgw-s3.yml deleted file mode 100644 index 06d82991b..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/radosgw-s3.yml +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - radosgw_s3_cluster_port: 8081 - keystone: - client: - server: - identity: - project: - service: - user: - swift: - is_admin: true - password: ${_param:keystone_swift_password} - email: ${_param:admin_email} - service: - radosgw-s3: - type: s3 - description: S3 Service (radosgw) - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: ${_param:radosgw_s3_cluster_port} - public_path: '/' # /$(project_id)s - internal_address: ${_param:radosgw_service_host} - internal_port: ${_param:radosgw_s3_cluster_port} - internal_path: '/' - admin_address: ${_param:radosgw_service_host} - admin_port: ${_param:radosgw_s3_cluster_port} - admin_path: '/' diff --git a/mcp/reclass/classes/system/keystone/client/service/radosgw-swift.yml b/mcp/reclass/classes/system/keystone/client/service/radosgw-swift.yml deleted file mode 100644 index 9c7547e54..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/radosgw-swift.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - swift: - is_admin: true - password: ${_param:keystone_swift_password} - email: ${_param:admin_email} - service: - radosgw-swift: - type: object-store - description: Swift Service (radosgw) - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8081 - public_path: '/swift/v1' # /$(project_id)s - internal_address: ${_param:radosgw_service_host} - internal_port: 8081 - internal_path: '/swift/v1' - admin_address: ${_param:radosgw_service_host} - admin_port: 8081 - admin_path: '/swift/v1' diff --git a/mcp/reclass/classes/system/keystone/client/service/sahara.yml b/mcp/reclass/classes/system/keystone/client/service/sahara.yml deleted file mode 100644 index 84a0b9621..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/sahara.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - sahara: - is_admin: true - password: ${_param:keystone_sahara_password} - email: ${_param:admin_email} - service: - sahara: - type: data-processing - description: Sahara Data Processing - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8386 - public_path: '/v1.1/%(project_id)s' - internal_address: ${_param:sahara_service_host} - internal_port: 8386 - internal_path: '/v1.1/%(project_id)s' - admin_address: ${_param:sahara_service_host} - admin_port: 8386 - admin_path: '/v1.1/%(project_id)s' diff --git a/mcp/reclass/classes/system/keystone/client/service/swift-s3.yml b/mcp/reclass/classes/system/keystone/client/service/swift-s3.yml deleted file mode 100644 index 5880487c9..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/swift-s3.yml +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - swift: - is_admin: true - password: ${_param:keystone_swift_password} - email: ${_param:admin_email} - service: - swift-s3: - type: object-store - description: S3 Service (swift) - region: ${_param:openstack_region} - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8080 - public_path: '/v1/AUTH_%(project_id)s' - internal_address: ${_param:swift_service_host} - internal_port: 8080 - internal_path: '/v1/AUTH_%(project_id)s' - admin_address: ${_param:swift_service_host} - admin_port: 8080 - admin_path: '/' diff --git a/mcp/reclass/classes/system/keystone/client/service/swift.yml b/mcp/reclass/classes/system/keystone/client/service/swift.yml deleted file mode 100644 index 781fab9c6..000000000 --- a/mcp/reclass/classes/system/keystone/client/service/swift.yml +++ /dev/null @@ -1,30 +0,0 @@ -parameters: - _param: - cluster_public_protocol: https - keystone: - client: - server: - identity: - project: - service: - user: - swift: - is_admin: true - password: ${_param:keystone_swift_password} - email: ${_param:admin_email} - service: - swift: - type: object-store - description: Swift Service - endpoints: - - region: ${_param:openstack_region} - public_address: ${_param:cluster_public_host} - public_protocol: ${_param:cluster_public_protocol} - public_port: 8080 - public_path: '/v1/AUTH_%(project_id)s' - internal_address: ${_param:swift_service_host} - internal_port: 8080 - internal_path: '/v1/AUTH_%(project_id)s' - admin_address: ${_param:swift_service_host} - admin_port: 8080 - admin_path: '/' diff --git a/mcp/reclass/classes/system/keystone/client/single.yml b/mcp/reclass/classes/system/keystone/client/single.yml deleted file mode 100644 index 6d7a4c689..000000000 --- a/mcp/reclass/classes/system/keystone/client/single.yml +++ /dev/null @@ -1,40 +0,0 @@ -classes: -- system.keystone.client.service.cinder -- system.keystone.client.service.cinder2 -- system.keystone.client.service.glance -- system.keystone.client.service.heat -- system.keystone.client.service.heat-cfn -- system.keystone.client.service.keystone -- system.keystone.client.service.neutron -- system.keystone.client.service.nova-ec2 -parameters: - linux: - system: - job: - keystone_job_rotate: - command: '/usr/bin/keystone-manage fernet_rotate --keystone-user keystone --keystone-group keystone >> /var/log/key_rotation_log 2>> /var/log/key_rotation_log' - enabled: true - user: root - minute: 0 - keystone: - client: - enabled: true - server: - identity: - admin: - host: ${_param:keystone_service_host} - port: 35357 - token: ${_param:keystone_service_token} - roles: - - admin - - Member - project: - service: - description: "OpenStack Service tenant" - admin: - description: "OpenStack Admin tenant" - user: - admin: - is_admin: true - password: ${_param:keystone_admin_password} - email: ${_param:admin_email} diff --git a/mcp/reclass/classes/system/keystone/server/cluster.yml b/mcp/reclass/classes/system/keystone/server/cluster.yml deleted file mode 100644 index f077faf0d..000000000 --- a/mcp/reclass/classes/system/keystone/server/cluster.yml +++ /dev/null @@ -1,46 +0,0 @@ -classes: -- service.keystone.server.cluster -- service.keepalived.cluster.single -- system.haproxy.proxy.listen.openstack.keystone -parameters: - keystone: - server: - enabled: true - version: ${_param:keystone_version} - service_token: ${_param:keystone_service_token} - service_tenant: service - admin_tenant: admin - admin_name: admin - admin_password: ${_param:keystone_admin_password} - admin_email: ${_param:admin_email} - bind: - address: ${_param:cluster_local_address} - private_address: ${_param:cluster_vip_address} - private_port: 35357 - public_address: ${_param:cluster_vip_address} - public_port: 5000 - region: ${_param:openstack_region} - database: - engine: mysql - host: ${_param:openstack_database_address} - name: keystone - password: ${_param:mysql_keystone_password} - user: keystone - tokens: - engine: fernet - expiration: 3600 - max_active_keys: 3 - location: /var/lib/keystone/fernet-keys - 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' - ha_queues: true - auth_methods: - - password - - token diff --git a/mcp/reclass/classes/system/keystone/server/notification/cadf.yml b/mcp/reclass/classes/system/keystone/server/notification/cadf.yml deleted file mode 100644 index dffb278a7..000000000 --- a/mcp/reclass/classes/system/keystone/server/notification/cadf.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - keystone: - server: - notification_format: cadf diff --git a/mcp/reclass/classes/system/keystone/server/notification/messagingv2.yml b/mcp/reclass/classes/system/keystone/server/notification/messagingv2.yml deleted file mode 100644 index 2cc7e6430..000000000 --- a/mcp/reclass/classes/system/keystone/server/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - keystone: - server: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/keystone/server/single.yml b/mcp/reclass/classes/system/keystone/server/single.yml deleted file mode 100644 index aae179f27..000000000 --- a/mcp/reclass/classes/system/keystone/server/single.yml +++ /dev/null @@ -1,53 +0,0 @@ -classes: -- service.keystone.server.single -parameters: - _param: - keystone_service_token: token - keystone_admin_password: password - mysql_admin_user: root - mysql_admin_password: password - mysql_keystone_password: password - keystone: - server: - enabled: true - version: ${_param:keystone_version} - service_token: ${_param:keystone_service_token} - service_tenant: service - admin_tenant: admin - admin_name: admin - admin_password: ${_param:keystone_admin_password} - admin_email: ${_param:admin_email} - bind: - address: ${_param:single_address} - private_address: ${_param:single_address} - private_port: 35357 - public_address: ${_param:single_address} - public_port: 5000 - region: ${_param:openstack_region} - database: - engine: mysql - host: ${_param:single_address} - name: keystone - password: ${_param:mysql_keystone_password} - user: keystone - tokens: - engine: fernet - expiration: 3600 - max_active_keys: 3 - location: /var/lib/keystone/fernet-keys - message_queue: - engine: rabbitmq - host: ${_param:single_address} - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - ha_queues: true - roles: - - admin - - Member - - image_manager - auth_methods: - - password - - token - database: - host: 127.0.0.1 diff --git a/mcp/reclass/classes/system/keystone/server/websso.yml b/mcp/reclass/classes/system/keystone/server/websso.yml deleted file mode 100644 index 0960ccb32..000000000 --- a/mcp/reclass/classes/system/keystone/server/websso.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- service.shibboleth.server.cluster -parameters: - keystone: - server: - websso: - protocol: saml2 - remote_id_attribute: Shib-Identity-Provider - federation_driver: keystone.contrib.federation.backends.sql.Federation - trusted_dashboard: - - https://${_param:cluster_public_host}/auth/websso/ - - https://${_param:proxy_vip_host}/auth/websso/ - auth_methods: - - saml2 - - external diff --git a/mcp/reclass/classes/system/keystone/server/wsgi.yml b/mcp/reclass/classes/system/keystone/server/wsgi.yml deleted file mode 100644 index 2c8a19deb..000000000 --- a/mcp/reclass/classes/system/keystone/server/wsgi.yml +++ /dev/null @@ -1,19 +0,0 @@ -classes: -- system.apache.server.single -parameters: - keystone: - server: - service_name: apache2 - apache: - server: - enabled: true - default_mpm: event - site: - keystone: - enabled: true - type: keystone - name: wsgi - host: - name: ${linux:network:fqdn} - modules: - - wsgi diff --git a/mcp/reclass/classes/system/linux/network/interface/single_dhcp.yml b/mcp/reclass/classes/system/linux/network/interface/single_dhcp.yml deleted file mode 100644 index c3a69ab7f..000000000 --- a/mcp/reclass/classes/system/linux/network/interface/single_dhcp.yml +++ /dev/null @@ -1,9 +0,0 @@ -parameters: - linux: - network: - interface: - primary_interface: - enabled: true - name: ${_param:primary_interface} - type: eth - proto: dhcp diff --git a/mcp/reclass/classes/system/linux/network/interface/single_ovs_dvr.yml b/mcp/reclass/classes/system/linux/network/interface/single_ovs_dvr.yml deleted file mode 100644 index 482bd028a..000000000 --- a/mcp/reclass/classes/system/linux/network/interface/single_ovs_dvr.yml +++ /dev/null @@ -1,67 +0,0 @@ -parameters: - _param: - primary_interface: eth1 - tenant_interface: eth2 - external_interface: eth3 - interface_mtu: 9000 - linux: - network: - bridge: openvswitch - interface: - primary_interface: - enabled: true - name: ${_param:primary_interface} - type: eth - mtu: ${_param:interface_mtu} - proto: manual - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - type: eth - mtu: ${_param:interface_mtu} - proto: manual - external_interface: - enabled: true - name: ${_param:external_interface} - type: eth - mtu: ${_param:interface_mtu} - proto: manual - br-int: - enabled: true - mtu: ${_param:interface_mtu} - type: ovs_bridge - br-floating: - enabled: true - mtu: ${_param:interface_mtu} - type: ovs_bridge - float-to-ex: - enabled: true - type: ovs_port - mtu: 65000 - bridge: br-floating - br-mgmt: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:primary_interface} - br-mesh: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex
\ No newline at end of file diff --git a/mcp/reclass/classes/system/linux/network/interface/single_static.yml b/mcp/reclass/classes/system/linux/network/interface/single_static.yml deleted file mode 100644 index 18f46a255..000000000 --- a/mcp/reclass/classes/system/linux/network/interface/single_static.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - linux: - network: - interface: - primary_interface: - enabled: true - name: ${_param:primary_interface} - type: eth - proto: manual - address: ${_param:single_address}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/linux/storage/loopback.yml b/mcp/reclass/classes/system/linux/storage/loopback.yml deleted file mode 100644 index adbbe65f3..000000000 --- a/mcp/reclass/classes/system/linux/storage/loopback.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - linux: - storage: - enabled: true - loopback: - loop0: - file: "/srv/disk0" - size: ${_param:loopback_device_size}G diff --git a/mcp/reclass/classes/system/linux/system/haveged.yml b/mcp/reclass/classes/system/linux/system/haveged.yml deleted file mode 100644 index 5c0be1512..000000000 --- a/mcp/reclass/classes/system/linux/system/haveged.yml +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - linux: - system: - haveged: - enabled: true diff --git a/mcp/reclass/classes/system/linux/system/lowmem.yml b/mcp/reclass/classes/system/linux/system/lowmem.yml deleted file mode 100644 index e1f119384..000000000 --- a/mcp/reclass/classes/system/linux/system/lowmem.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - linux: - storage: - swap: - swap01: - enabled: true - engine: file - device: /var/tmp/swap01 - size: 2048 -# opencontrail: -# database: -# max_heap_size: "1G" -# heap_newsize: "200M" -# rabbitmq: -# server: -# memory: -# vm_high_watermark: 0.2 diff --git a/mcp/reclass/classes/system/linux/system/motd/dynamic.yml b/mcp/reclass/classes/system/linux/system/motd/dynamic.yml deleted file mode 100644 index 9589e8ef9..000000000 --- a/mcp/reclass/classes/system/linux/system/motd/dynamic.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - linux: - system: - motd: - - warning: | - #!/bin/sh - printf "WARNING: This is private network.\n" - printf " Unauthorized access is strictly prohibited.\n" - printf "\n" - - info: | - #!/bin/sh - printf -- "------------------------------------------------------\n" - printf " Hostname | $(hostname)\n" - printf " Domain | $(hostname -d)\n" - printf " System | %s\n" "$(lsb_release -s -d)" - printf " Kernel | %s\n" "$(uname -r)" - printf " Uptime | %s\n" "$(uptime -p)" - printf " Load Average | %s\n" "$(cat /proc/loadavg | awk '{print $1", "$2", "$3}')" - printf -- "------------------------------------------------------\n" diff --git a/mcp/reclass/classes/system/linux/system/motd/static.yml b/mcp/reclass/classes/system/linux/system/motd/static.yml deleted file mode 100644 index 774abc67f..000000000 --- a/mcp/reclass/classes/system/linux/system/motd/static.yml +++ /dev/null @@ -1,12 +0,0 @@ -parameters: - linux: - system: - motd: | - WARNING: This is private network - Unauthorized access is strictly prohibited - - ------------------------------------------------------ - Hostname | ${linux:system:name} - Domain | ${linux:system:domain} - ------------------------------------------------------ - diff --git a/mcp/reclass/classes/system/linux/system/prompt/init.yml b/mcp/reclass/classes/system/linux/system/prompt/init.yml deleted file mode 100644 index 2f0120d8c..000000000 --- a/mcp/reclass/classes/system/linux/system/prompt/init.yml +++ /dev/null @@ -1,7 +0,0 @@ -parameters: - linux: - system: - prompt: - default: \\n\\[\\033[0;37m\\]\\D{%y/%m/%d %H:%M:%S} ${linux:system:name}.${linux:system:domain}\\[\\e[0m\\]\\n\\[\\e[1;39m\\][\\u@\\h:\\w]\\[\\e[0m\\] - bash: - preserve_history: true diff --git a/mcp/reclass/classes/system/linux/system/prompt/production.yml b/mcp/reclass/classes/system/linux/system/prompt/production.yml deleted file mode 100644 index f8784605d..000000000 --- a/mcp/reclass/classes/system/linux/system/prompt/production.yml +++ /dev/null @@ -1,7 +0,0 @@ -classes: - - system.linux.system.prompt -parameters: - linux: - system: - prompt: - default: \\n\\[\\033[0;37m\\]\\D{%y/%m/%d %H:%M:%S} ${linux:system:name}.${linux:system:domain}\\[\\e[0m\\]\\n\\[\\e[1;31m\\][\\u@\\h:\\w]\\[\\e[0m\\] diff --git a/mcp/reclass/classes/system/linux/system/repo/cassandra.yml b/mcp/reclass/classes/system/linux/system/repo/cassandra.yml deleted file mode 100644 index 74fb02119..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/cassandra.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - _param: - linux_repo_cassandra_component: 21x - linux: - system: - repo: - cassandra: - source: "deb http://www.apache.org/dist/cassandra/debian/ ${_param:linux_repo_cassandra_component} main" - architectures: amd64 - key_url: "https://www.apache.org/dist/cassandra/KEYS" diff --git a/mcp/reclass/classes/system/linux/system/repo/docker.yml b/mcp/reclass/classes/system/linux/system/repo/docker.yml deleted file mode 100644 index 6eae575d0..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/docker.yml +++ /dev/null @@ -1,9 +0,0 @@ -parameters: - linux: - system: - repo: - docker: - source: "deb https://apt.dockerproject.org/repo ubuntu-${_param:linux_system_codename} main" - architectures: amd64 - key_id: 58118E89F3A912897C070ADBF76221572C52609D - key_server: hkp://p80.pool.sks-keyservers.net:80 diff --git a/mcp/reclass/classes/system/linux/system/repo/elasticsearch.yml b/mcp/reclass/classes/system/linux/system/repo/elasticsearch.yml deleted file mode 100644 index 60f6fd075..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/elasticsearch.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - linux: - system: - repo: - elasticsearch: - source: "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main" - architectures: amd64 - key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch"
\ No newline at end of file diff --git a/mcp/reclass/classes/system/linux/system/repo/glusterfs.yml b/mcp/reclass/classes/system/linux/system/repo/glusterfs.yml deleted file mode 100644 index fb331f0f3..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/glusterfs.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - _param: - glusterfs_version: 3.8 - linux: - system: - repo: - glusterfs-ppa: - source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main" - architectures: amd64 - key_id: 3FE869A9 - key_server: keyserver.ubuntu.com diff --git a/mcp/reclass/classes/system/linux/system/repo/grafana.yml b/mcp/reclass/classes/system/linux/system/repo/grafana.yml deleted file mode 100644 index c1c8a5b35..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/grafana.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - linux: - system: - repo: - grafana: - enabled: true - source: 'deb https://packagecloud.io/grafana/stable/debian/ jessie main' - key_url: 'https://packagecloud.io/gpg.key' diff --git a/mcp/reclass/classes/system/linux/system/repo/influxdb.yml b/mcp/reclass/classes/system/linux/system/repo/influxdb.yml deleted file mode 100644 index b9345039d..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/influxdb.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - linux: - system: - repo: - influxdb: - source: 'deb [arch=amd64] https://repos.influxdata.com/ubuntu ${_param:linux_system_codename} stable' - architectures: amd64 - key_url: 'https://repos.influxdata.com/influxdb.key'
\ No newline at end of file diff --git a/mcp/reclass/classes/system/linux/system/repo/kibana.yml b/mcp/reclass/classes/system/linux/system/repo/kibana.yml deleted file mode 100644 index 425141d10..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/kibana.yml +++ /dev/null @@ -1,7 +0,0 @@ -parameters: - linux: - system: - repo: - kibana: - source: "deb https://packages.elastic.co/kibana/4.6/debian stable main" - key_url: "https://packages.elastic.co/GPG-KEY-elasticsearch" diff --git a/mcp/reclass/classes/system/linux/system/repo/mcp/extra.yml b/mcp/reclass/classes/system/linux/system/repo/mcp/extra.yml deleted file mode 100644 index 00de9eacd..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/mcp/extra.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - apt_mk_version: stable - linux: - system: - repo: - mcp_extra: - source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} extra" - architectures: amd64 - key_url: "http://apt-mk.mirantis.com/public.gpg" - clean_file: true - pin: - - pin: 'release a=${_param:apt_mk_version}' - priority: 1100 - package: '*' diff --git a/mcp/reclass/classes/system/linux/system/repo/mcp/openstack.yml b/mcp/reclass/classes/system/linux/system/repo/mcp/openstack.yml deleted file mode 100644 index 9f26821d0..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/mcp/openstack.yml +++ /dev/null @@ -1,54 +0,0 @@ -parameters: - _param: - apt_mk_version: stable - linux: - system: - repo: - mirantis_openstack: - source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main" - architectures: amd64 - key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" - pin: - - pin: 'release a=${_param:openstack_version}' - priority: 1100 - package: '*' - mirantis_openstack_hotfix: - source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-hotfix main" - architectures: amd64 - key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" - pin: - - pin: 'release a=${_param:openstack_version}-hotfix' - priority: 1100 - package: '*' - mirantis_openstack_security: - source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-security main" - architectures: amd64 - key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" - pin: - - pin: 'release a=${_param:openstack_version}-security' - priority: 1100 - package: '*' - mirantis_openstack_updates: - source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-updates main" - architectures: amd64 - key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" - pin: - - pin: 'release a=${_param:openstack_version}-uptades' - priority: 1100 - package: '*' - mirantis_openstack_holdback: - source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-holdback main" - architectures: amd64 - key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" - pin: - - pin: 'release a=${_param:openstack_version}-holdback' - priority: 1100 - package: '*' - mk_openstack: - source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:openstack_version}" - architectures: amd64 - key_url: "http://apt-mk.mirantis.com/public.gpg" - pin: - - pin: 'release a=${_param:apt_mk_version}' - priority: 1100 - package: '*' diff --git a/mcp/reclass/classes/system/linux/system/repo/mcp/salt.yml b/mcp/reclass/classes/system/linux/system/repo/mcp/salt.yml deleted file mode 100644 index d40cc5fbe..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/mcp/salt.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - apt_mk_version: stable - linux: - system: - repo: - mcp_salt: - source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} salt" - architectures: amd64 - key_url: "http://apt-mk.mirantis.com/public.gpg" - clean_file: true - pin: - - pin: 'release a=${_param:apt_mk_version}' - priority: 1100 - package: '*' diff --git a/mcp/reclass/classes/system/linux/system/repo/saltstack/xenial.yml b/mcp/reclass/classes/system/linux/system/repo/saltstack/xenial.yml deleted file mode 100644 index aca462a67..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/saltstack/xenial.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - _param: - salt_version: 2016.3 - linux: - system: - repo: - salt: - source: "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/${_param:salt_version} xenial main" - architectures: amd64 - key_url: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/${_param:salt_version}/SALTSTACK-GPG-KEY.pub"
\ No newline at end of file diff --git a/mcp/reclass/classes/system/linux/system/repo/sensu.yml b/mcp/reclass/classes/system/linux/system/repo/sensu.yml deleted file mode 100644 index 1ea368712..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/sensu.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - linux: - system: - repo: - sensu: - source: "deb https://sensu.global.ssl.fastly.net/apt ${_param:linux_system_codename} main" - architectures: amd64 - key_url: "https://sensu.global.ssl.fastly.net/apt/pubkey.gpg"
\ No newline at end of file diff --git a/mcp/reclass/classes/system/linux/system/repo/ubuntu.yml b/mcp/reclass/classes/system/linux/system/repo/ubuntu.yml deleted file mode 100644 index d36bcc1f0..000000000 --- a/mcp/reclass/classes/system/linux/system/repo/ubuntu.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - linux: - system: - repo: - ubuntu: - source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename} main restricted universe" - architectures: amd64 - default: true - key_id: 437D05B5 - key_server: keyserver.ubuntu.com - ubuntu_updates: - source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-updates main restricted universe" - architectures: amd64 - default: true - key_id: 437D05B5 - key_server: keyserver.ubuntu.com - ubuntu_security: - source: "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ ${_param:linux_system_codename}-security main restricted universe" - architectures: amd64 - default: true - key_id: 437D05B5 - key_server: keyserver.ubuntu.com
\ No newline at end of file diff --git a/mcp/reclass/classes/system/linux/system/single.yml b/mcp/reclass/classes/system/linux/system/single.yml deleted file mode 100644 index 056fb9863..000000000 --- a/mcp/reclass/classes/system/linux/system/single.yml +++ /dev/null @@ -1,58 +0,0 @@ -classes: -- service.linux.system -- service.salt.minion.master -- system.ntp.client.single -parameters: - linux: - system: - package: - python-msgpack: - version: latest - cloud-init: - version: purged - mcelog: - version: latest - kernel: - modules: - - nf_conntrack - sysctl: - net.ipv4.tcp_keepalive_intvl: 3 - net.ipv4.tcp_keepalive_time: 30 - net.ipv4.tcp_keepalive_probes: 8 - fs.file-max: 124165 - net.core.somaxconn: 4096 - vm.swappiness: 10 - net.nf_conntrack_max: 1048576 - net.ipv4.tcp_retries2: 5 - net.ipv4.tcp_max_syn_backlog: 8192 - net.ipv4.neigh.default.gc_thresh1: 4096 - net.ipv4.neigh.default.gc_thresh2: 8192 - net.ipv4.neigh.default.gc_thresh3: 16384 - net.core.netdev_max_backlog: 261144 - kernel.panic: 60 - cpu: - governor: performance - timezone: UTC - locale: - en_US.UTF-8: - enabled: true - default: true - cs_CZ.UTF-8: - enabled: true - limit: - default: - enabled: true - domain: "*" - limits: - - type: hard - item: nofile - value: 307200 - - type: soft - item: nofile - value: 307200 - - type: soft - item: nproc - value: 307200 - - type: hard - item: nproc - value: 307200 diff --git a/mcp/reclass/classes/system/linux/system/sudo.yml b/mcp/reclass/classes/system/linux/system/sudo.yml deleted file mode 100644 index 1668c1277..000000000 --- a/mcp/reclass/classes/system/linux/system/sudo.yml +++ /dev/null @@ -1,43 +0,0 @@ -parameters: - _param: - sudo_shells: - - /bin/sh - - /bin/ksh - - /bin/bash - - /bin/rbash - - /bin/dash - - /bin/zsh - - /bin/csh - - /bin/fish - - /bin/tcsh - - /usr/bin/login - - /usr/bin/su - - /usr/su - sudo_restricted_su: - - /bin/vi* /etc/sudoers* - - /bin/nano /etc/sudoers* - - /bin/emacs /etc/sudoers* - - /bin/su - root - - /bin/su - - - /bin/su - - /usr/sbin/visudo - sudo_coreutils_safe: - - /usr/bin/less - sudo_rabbitmq_safe: - - /usr/sbin/rabbitmqctl status - - /usr/sbin/rabbitmqctl cluster_status - - /usr/sbin/rabbitmqctl list_queues* - sudo_salt_safe: - - /usr/bin/salt * state* - - /usr/bin/salt * service* - - /usr/bin/salt * pillar* - - /usr/bin/salt * grains* - - /usr/bin/salt * saltutil* - - /usr/bin/salt * test.ping - - /usr/bin/salt-call state* - - /usr/bin/salt-call service* - - /usr/bin/salt-call pillar* - - /usr/bin/salt-call grains* - - /usr/bin/salt-call saltutil* - sudo_salt_trusted: - - /usr/bin/salt* diff --git a/mcp/reclass/classes/system/maas/region/cluster.yml b/mcp/reclass/classes/system/maas/region/cluster.yml deleted file mode 100644 index 8df6ea8a8..000000000 --- a/mcp/reclass/classes/system/maas/region/cluster.yml +++ /dev/null @@ -1,12 +0,0 @@ -classes: - - system.maas.region.single - - system.keepalived.server.cluster_maas -parameters: - _param: - cluster_vip_address: 10.0.175.80 - maas: - cluster: - enabled: true - role: ${_param:maas_cluster_role} - region: - host: ${_param:cluster_vip_address}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/maas/region/single.yml b/mcp/reclass/classes/system/maas/region/single.yml deleted file mode 100644 index 569d47540..000000000 --- a/mcp/reclass/classes/system/maas/region/single.yml +++ /dev/null @@ -1,16 +0,0 @@ -classes: - - service.maas.region.single - - service.maas.region.vendor_repo -parameters: - maas: - region: - theme: mirantis - enable_iframe: True - bind: - host: ${_param:cluster_vip_address} - database: - engine: postgresql - host: 10.0.175.10 - name: maasdb - password: password - username: maas
\ No newline at end of file diff --git a/mcp/reclass/classes/system/memcached/server/single.yml b/mcp/reclass/classes/system/memcached/server/single.yml deleted file mode 100644 index 7577e89e4..000000000 --- a/mcp/reclass/classes/system/memcached/server/single.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.memcached.server.single diff --git a/mcp/reclass/classes/system/mongodb/server/cluster.yml b/mcp/reclass/classes/system/mongodb/server/cluster.yml deleted file mode 100644 index f3c16d677..000000000 --- a/mcp/reclass/classes/system/mongodb/server/cluster.yml +++ /dev/null @@ -1,11 +0,0 @@ -classes: -- service.mongodb.server.cluster -parameters: - _param: - mongodb_server_replica_set: mongodb - mongodb_master: mdb01 - mongodb_server_members: - - host: mdb01 - priority: 2 - - host: mdb02 - - host: mdb03 diff --git a/mcp/reclass/classes/system/mongodb/server/database/ceilometer.yml b/mcp/reclass/classes/system/mongodb/server/database/ceilometer.yml deleted file mode 100644 index 4adabc052..000000000 --- a/mcp/reclass/classes/system/mongodb/server/database/ceilometer.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - mongodb: - server: - database: - ceilometer: - enabled: true - password: ${_param:mongodb_ceilometer_password} - users: - - name: ceilometer - password: ${_param:mongodb_ceilometer_password} diff --git a/mcp/reclass/classes/system/mongodb/server/single.yml b/mcp/reclass/classes/system/mongodb/server/single.yml deleted file mode 100644 index c3d6ccaf1..000000000 --- a/mcp/reclass/classes/system/mongodb/server/single.yml +++ /dev/null @@ -1,5 +0,0 @@ -classes: -- service.mongodb.server.single -parameters: - _param: - mongodb_server_replica_set: ceilometer diff --git a/mcp/reclass/classes/system/mysql/client/database/aodh.yml b/mcp/reclass/classes/system/mysql/client/database/aodh.yml deleted file mode 100644 index 92a2b2929..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/aodh.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - aodh: - encoding: utf8 - users: - - name: aodh - password: ${_param:mysql_aodh_password} - host: '%' - rights: all - - name: aodh - password: ${_param:mysql_aodh_password} - host: ${_param:single_address} - rights: all
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database/ceilometer.yml b/mcp/reclass/classes/system/mysql/client/database/ceilometer.yml deleted file mode 100644 index 436bf9755..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/ceilometer.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - ceilometer: - encoding: utf8 - users: - - name: ceilometer - password: ${_param:mysql_ceilometer_password} - host: '%' - rights: all - - name: ceilometer - password: ${_param:mysql_ceilometer_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/cinder.yml b/mcp/reclass/classes/system/mysql/client/database/cinder.yml deleted file mode 100644 index 4d6783b07..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/cinder.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - cinder: - encoding: utf8 - users: - - name: cinder - password: ${_param:mysql_cinder_password} - host: '%' - rights: all - - name: cinder - password: ${_param:mysql_cinder_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/designate.yml b/mcp/reclass/classes/system/mysql/client/database/designate.yml deleted file mode 100644 index cee6ff135..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/designate.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - designate: - encoding: utf8 - users: - - name: designate - password: ${_param:mysql_designate_password} - host: '%' - rights: all - - name: designate - password: ${_param:mysql_designate_password} - host: ${_param:single_address} - rights: all
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database/designate_pool_manager.yml b/mcp/reclass/classes/system/mysql/client/database/designate_pool_manager.yml deleted file mode 100644 index 6913bd450..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/designate_pool_manager.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - designate_pool_manager: - encoding: utf8 - users: - - name: designate - password: ${_param:mysql_designate_password} - host: '%' - rights: all - - name: designate - password: ${_param:mysql_designate_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/glance.yml b/mcp/reclass/classes/system/mysql/client/database/glance.yml deleted file mode 100644 index b93b3434a..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/glance.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - glance: - encoding: utf8 - users: - - name: glance - password: ${_param:mysql_glance_password} - host: '%' - rights: all - - name: glance - password: ${_param:mysql_glance_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/grafana.yml b/mcp/reclass/classes/system/mysql/client/database/grafana.yml deleted file mode 100644 index a2899f060..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/grafana.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - grafana: - encoding: utf8 - users: - - name: grafana - password: ${_param:mysql_grafana_password} - host: '%' - rights: all - - name: grafana - password: ${_param:mysql_grafana_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/heat.yml b/mcp/reclass/classes/system/mysql/client/database/heat.yml deleted file mode 100644 index 51aae8fbb..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/heat.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - heat: - encoding: utf8 - users: - - name: heat - password: ${_param:mysql_heat_password} - host: '%' - rights: all - - name: heat - password: ${_param:mysql_heat_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/keystone.yml b/mcp/reclass/classes/system/mysql/client/database/keystone.yml deleted file mode 100644 index 09885dd85..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/keystone.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - keystone: - encoding: utf8 - users: - - name: keystone - password: ${_param:mysql_keystone_password} - host: '%' - rights: all - - name: keystone - password: ${_param:mysql_keystone_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/murano.yml b/mcp/reclass/classes/system/mysql/client/database/murano.yml deleted file mode 100644 index 561ea3dcd..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/murano.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - murano: - encoding: utf8 - users: - - name: murano - password: ${_param:mysql_murano_password} - host: '%' - rights: all - - name: murano - password: ${_param:mysql_murano_password} - host: ${_param:single_address} - rights: all
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database/neutron.yml b/mcp/reclass/classes/system/mysql/client/database/neutron.yml deleted file mode 100644 index 94d972253..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/neutron.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - neutron: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/nova.yml b/mcp/reclass/classes/system/mysql/client/database/nova.yml deleted file mode 100644 index 930b2805a..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/nova.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - nova: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/nova_api.yml b/mcp/reclass/classes/system/mysql/client/database/nova_api.yml deleted file mode 100644 index a8fbd59f0..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/nova_api.yml +++ /dev/null @@ -1,28 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - nova_api: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:single_address} - rights: all - nova_cell0: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database/sahara.yml b/mcp/reclass/classes/system/mysql/client/database/sahara.yml deleted file mode 100644 index 86497d8e8..000000000 --- a/mcp/reclass/classes/system/mysql/client/database/sahara.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - sahara: - encoding: utf8 - users: - - name: sahara - password: ${_param:mysql_sahara_password} - host: '%' - rights: all - - name: sahara - password: ${_param:mysql_sahara_password} - host: ${_param:single_address} - rights: all diff --git a/mcp/reclass/classes/system/mysql/client/database_init/aodh.yml b/mcp/reclass/classes/system/mysql/client/database_init/aodh.yml deleted file mode 100644 index 5a88169a7..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/aodh.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.aodh -parameters: - mysql: - client: - enabled: true - server: - database: - database: - aodh: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: aodh diff --git a/mcp/reclass/classes/system/mysql/client/database_init/ceilometer.yml b/mcp/reclass/classes/system/mysql/client/database_init/ceilometer.yml deleted file mode 100644 index 7f13c6d67..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/ceilometer.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.ceilometer -parameters: - mysql: - client: - enabled: true - server: - database: - database: - ceilometer: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: ceilometer diff --git a/mcp/reclass/classes/system/mysql/client/database_init/cinder.yml b/mcp/reclass/classes/system/mysql/client/database_init/cinder.yml deleted file mode 100644 index 9614aad0d..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/cinder.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.cinder -parameters: - mysql: - client: - enabled: true - server: - database: - database: - cinder: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: cinder diff --git a/mcp/reclass/classes/system/mysql/client/database_init/designate.yml b/mcp/reclass/classes/system/mysql/client/database_init/designate.yml deleted file mode 100644 index 99d0036c5..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/designate.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.designate -parameters: - mysql: - client: - enabled: true - server: - database: - database: - designate: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: designate diff --git a/mcp/reclass/classes/system/mysql/client/database_init/designate_pool_manager.yml b/mcp/reclass/classes/system/mysql/client/database_init/designate_pool_manager.yml deleted file mode 100644 index 6a5b385ed..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/designate_pool_manager.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.designate_pool_manager -parameters: - mysql: - client: - enabled: true - server: - database: - database: - designate_pool_manager: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: designate_pool_manager diff --git a/mcp/reclass/classes/system/mysql/client/database_init/glance.yml b/mcp/reclass/classes/system/mysql/client/database_init/glance.yml deleted file mode 100644 index 703c603b2..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/glance.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.glance -parameters: - mysql: - client: - enabled: true - server: - database: - database: - glance: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: glance diff --git a/mcp/reclass/classes/system/mysql/client/database_init/grafana.yml b/mcp/reclass/classes/system/mysql/client/database_init/grafana.yml deleted file mode 100644 index aeb2e2630..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/grafana.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.grafana -parameters: - mysql: - client: - enabled: true - server: - database: - database: - grafana: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: grafana diff --git a/mcp/reclass/classes/system/mysql/client/database_init/heat.yml b/mcp/reclass/classes/system/mysql/client/database_init/heat.yml deleted file mode 100644 index c7a0f00c3..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/heat.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.heat -parameters: - mysql: - client: - enabled: true - server: - database: - database: - heat: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: heat diff --git a/mcp/reclass/classes/system/mysql/client/database_init/keystone.yml b/mcp/reclass/classes/system/mysql/client/database_init/keystone.yml deleted file mode 100644 index 555cae6df..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/keystone.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.keystone -parameters: - mysql: - client: - enabled: true - server: - database: - database: - keystone: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: keystone diff --git a/mcp/reclass/classes/system/mysql/client/database_init/murano.yml b/mcp/reclass/classes/system/mysql/client/database_init/murano.yml deleted file mode 100644 index 13515e708..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/murano.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.murano -parameters: - mysql: - client: - enabled: true - server: - database: - database: - murano: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: murano diff --git a/mcp/reclass/classes/system/mysql/client/database_init/neutron.yml b/mcp/reclass/classes/system/mysql/client/database_init/neutron.yml deleted file mode 100644 index 405f3e6b1..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/neutron.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.neutron -parameters: - mysql: - client: - enabled: true - server: - database: - database: - neutron: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: neutron diff --git a/mcp/reclass/classes/system/mysql/client/database_init/nova.yml b/mcp/reclass/classes/system/mysql/client/database_init/nova.yml deleted file mode 100644 index f1ee6cf47..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/nova.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.nova -parameters: - mysql: - client: - enabled: true - server: - database: - database: - nova: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: nova diff --git a/mcp/reclass/classes/system/mysql/client/database_init/nova_api.yml b/mcp/reclass/classes/system/mysql/client/database_init/nova_api.yml deleted file mode 100644 index 2fa8630a7..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/nova_api.yml +++ /dev/null @@ -1,21 +0,0 @@ -classes: -- system.mysql.client.database.nova_api -parameters: - mysql: - client: - enabled: true - server: - database: - database: - nova_api: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: nova_api - nova_cell0: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: nova_cell0 diff --git a/mcp/reclass/classes/system/mysql/client/database_init/sahara.yml b/mcp/reclass/classes/system/mysql/client/database_init/sahara.yml deleted file mode 100644 index ef3d981e0..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_init/sahara.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.mysql.client.database.sahara -parameters: - mysql: - client: - enabled: true - server: - database: - database: - sahara: - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: sahara diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/aodh.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/aodh.yml deleted file mode 100644 index d363161f6..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/aodh.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - aodh_upgrade: - encoding: utf8 - users: - - name: aodh - password: ${_param:mysql_aodh_password} - host: '%' - rights: all - - name: aodh - password: ${_param:mysql_aodh_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: aodh - diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/ceilometer.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/ceilometer.yml deleted file mode 100644 index 5344b4bd9..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/ceilometer.yml +++ /dev/null @@ -1,23 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - ceilometer_upgrade: - encoding: utf8 - users: - - name: ceilometer - password: ${_param:mysql_ceilometer_password} - host: '%' - rights: all - - name: ceilometer - password: ${_param:mysql_ceilometer_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: ceilometer - diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/cinder.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/cinder.yml deleted file mode 100644 index bafc70ddd..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/cinder.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - cinder_upgrade: - encoding: utf8 - users: - - name: cinder - password: ${_param:mysql_cinder_password} - host: '%' - rights: all - - name: cinder - password: ${_param:mysql_cinder_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: cinder
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/designate.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/designate.yml deleted file mode 100644 index 48b7fce64..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/designate.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - designate_upgrade: - encoding: utf8 - users: - - name: designate - password: ${_param:mysql_designate_password} - host: '%' - rights: all - - name: designate - password: ${_param:mysql_designate_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: designate
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/designate_pool_manager.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/designate_pool_manager.yml deleted file mode 100644 index 26dd9756f..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/designate_pool_manager.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - designate_pool_manager_upgrade: - encoding: utf8 - users: - - name: designate - password: ${_param:mysql_designate_password} - host: '%' - rights: all - - name: designate - password: ${_param:mysql_designate_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: designate_pool_manager
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/glance.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/glance.yml deleted file mode 100644 index bebe6047d..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/glance.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - glance_upgrade: - encoding: utf8 - users: - - name: glance - password: ${_param:mysql_glance_password} - host: '%' - rights: all - - name: glance - password: ${_param:mysql_glance_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: glance diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/grafana.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/grafana.yml deleted file mode 100644 index 7759a66cc..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/grafana.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - grafana_upgrade: - encoding: utf8 - users: - - name: grafana - password: ${_param:mysql_grafana_password} - host: '%' - rights: all - - name: grafana - password: ${_param:mysql_grafana_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: grafana
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/heat.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/heat.yml deleted file mode 100644 index 24e4cb1fd..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/heat.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - heat_upgrade: - encoding: utf8 - users: - - name: heat - password: ${_param:mysql_heat_password} - host: '%' - rights: all - - name: heat - password: ${_param:mysql_heat_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: heat
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/keystone.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/keystone.yml deleted file mode 100644 index 826566261..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/keystone.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - keystone_upgrade: - encoding: utf8 - users: - - name: keystone - password: ${_param:mysql_keystone_password} - host: '%' - rights: all - - name: keystone - password: ${_param:mysql_keystone_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: keystone
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/murano.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/murano.yml deleted file mode 100644 index 2223ce687..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/murano.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - murano_upgrade: - encoding: utf8 - users: - - name: murano - password: ${_param:mysql_murano_password} - host: '%' - rights: all - - name: murano - password: ${_param:mysql_murano_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: murano
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/neutron.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/neutron.yml deleted file mode 100644 index 7dd723c6f..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/neutron.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - neutron_upgrade: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: neutron
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/nova.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/nova.yml deleted file mode 100644 index 699c9c310..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/nova.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - nova_upgrade: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: nova
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/nova_api.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/nova_api.yml deleted file mode 100644 index 8bb33c8f9..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/nova_api.yml +++ /dev/null @@ -1,38 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - nova_upgrade_api: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: nova_api - nova_upgrade_cell0: - encoding: utf8 - users: - - name: nova - password: ${_param:mysql_nova_password} - host: '%' - rights: all - - name: nova - password: ${_param:mysql_nova_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: nova_cell0
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/database_upgrade/sahara.yml b/mcp/reclass/classes/system/mysql/client/database_upgrade/sahara.yml deleted file mode 100644 index 73618d07a..000000000 --- a/mcp/reclass/classes/system/mysql/client/database_upgrade/sahara.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - mysql: - client: - server: - database: - database: - sahara_upgrade: - encoding: utf8 - users: - - name: sahara - password: ${_param:mysql_sahara_password} - host: '%' - rights: all - - name: sahara - password: ${_param:mysql_sahara_password} - host: ${_param:single_address} - rights: all - initial_data: - engine: backupninja - source: ${_param:backupninja_backup_host} - host: ${linux:network:fqdn} - database: sahara
\ No newline at end of file diff --git a/mcp/reclass/classes/system/mysql/client/init.yml b/mcp/reclass/classes/system/mysql/client/init.yml deleted file mode 100644 index 4cea41a77..000000000 --- a/mcp/reclass/classes/system/mysql/client/init.yml +++ /dev/null @@ -1,14 +0,0 @@ -parameters: - _param: - mysql_client_host: localhost - mysql: - client: - enabled: true - server: - database: - admin: - host: ${_param:mysql_client_host} - port: 3306 - user: ${_param:mysql_admin_user} - password: ${_param:mysql_admin_password} - encoding: utf8 diff --git a/mcp/reclass/classes/system/mysql/client/single.yml b/mcp/reclass/classes/system/mysql/client/single.yml deleted file mode 100644 index f518a878a..000000000 --- a/mcp/reclass/classes/system/mysql/client/single.yml +++ /dev/null @@ -1,11 +0,0 @@ -classes: -- system.mysql.client -- system.mysql.client.database.aodh -- system.mysql.client.database.ceilometer -- system.mysql.client.database.cinder -- system.mysql.client.database.glance -- system.mysql.client.database.heat -- system.mysql.client.database.keystone -- system.mysql.client.database.nova -- system.mysql.client.database.nova_api -- system.mysql.client.database.neutron diff --git a/mcp/reclass/classes/system/mysql/client/single_init.yml b/mcp/reclass/classes/system/mysql/client/single_init.yml deleted file mode 100644 index 0c2004991..000000000 --- a/mcp/reclass/classes/system/mysql/client/single_init.yml +++ /dev/null @@ -1,24 +0,0 @@ -classes: -- system.mysql.client.database_init.aodh -- system.mysql.client.database_init.ceilometer -- system.mysql.client.database_init.cinder -- system.mysql.client.database_init.glance -- system.mysql.client.database_init.heat -- system.mysql.client.database_init.keystone -- system.mysql.client.database_init.nova -- system.mysql.client.database_init.nova_api -- system.mysql.client.database_init.neutron -parameters: - _param: - mysql_client_host: localhost - mysql: - client: - enabled: true - server: - database: - admin: - host: ${_param:mysql_client_host} - port: 3306 - user: ${_param:mysql_admin_user} - password: ${_param:mysql_admin_password} - encoding: utf8 diff --git a/mcp/reclass/classes/system/mysql/client/single_upgrade.yml b/mcp/reclass/classes/system/mysql/client/single_upgrade.yml deleted file mode 100644 index 595d3f7b0..000000000 --- a/mcp/reclass/classes/system/mysql/client/single_upgrade.yml +++ /dev/null @@ -1,25 +0,0 @@ -classes: -- system.mysql.client.database_upgrade.aodh -- system.mysql.client.database_upgrade.ceilometer -- system.mysql.client.database_upgrade.cinder -- system.mysql.client.database_upgrade.glance -- system.mysql.client.database_upgrade.heat -- system.mysql.client.database_upgrade.keystone -- system.mysql.client.database_upgrade.nova -- system.mysql.client.database_upgrade.nova_api -- system.mysql.client.database_upgrade.neutron -- service.mysql.client.single -parameters: - _param: - mysql_client_host: localhost - mysql: - client: - enabled: true - server: - database: - admin: - host: ${_param:mysql_client_host} - port: 3306 - user: ${_param:mysql_admin_user} - password: ${_param:mysql_admin_password} - encoding: utf8 diff --git a/mcp/reclass/classes/system/neutron/compute/cluster.yml b/mcp/reclass/classes/system/neutron/compute/cluster.yml deleted file mode 100644 index 989700645..000000000 --- a/mcp/reclass/classes/system/neutron/compute/cluster.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- service.neutron.compute.single -parameters: - neutron: - compute: - dvr: ${_param:neutron_compute_dvr} - agent_mode: ${_param:neutron_compute_agent_mode} - external_access: ${_param:neutron_compute_external_access} - backend: - tenant_network_types: ${_param:neutron_tenant_network_types}" - message_queue: - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/neutron/compute/nfv/dpdk.yml b/mcp/reclass/classes/system/neutron/compute/nfv/dpdk.yml deleted file mode 100644 index 90f909588..000000000 --- a/mcp/reclass/classes/system/neutron/compute/nfv/dpdk.yml +++ /dev/null @@ -1,17 +0,0 @@ -parameters: - _param: - compute_dpdk_driver: uio - linux: - network: - bridge: openvswitch - dpdk: - enabled: true - driver: "${_param:compute_dpdk_driver}" - openvswitch: - pmd_cpu_mask: "${_param:compute_ovs_pmd_cpu_mask}" - dpdk_socket_mem: "${_param:compute_ovs_dpdk_socket_mem}" - dpdk_lcore_mask: "${_param:compute_ovs_dpdk_lcore_mask}" - memory_channels: "${_param:compute_ovs_memory_channels}" - neutron: - compute: - dpdk: True diff --git a/mcp/reclass/classes/system/neutron/compute/nfv/sriov.yml b/mcp/reclass/classes/system/neutron/compute/nfv/sriov.yml deleted file mode 100644 index 882e703aa..000000000 --- a/mcp/reclass/classes/system/neutron/compute/nfv/sriov.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - neutron: - compute: - backend: - sriov: - sriov_nic01: - devname: ${_param:sriov_nic01_device_name} - physical_network: ${_param:sriov_nic01_physical_network} diff --git a/mcp/reclass/classes/system/neutron/compute/notification/messagingv2.yml b/mcp/reclass/classes/system/neutron/compute/notification/messagingv2.yml deleted file mode 100644 index 0e9d34a77..000000000 --- a/mcp/reclass/classes/system/neutron/compute/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - neutron: - compute: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/neutron/control/cluster.yml b/mcp/reclass/classes/system/neutron/control/cluster.yml deleted file mode 100644 index dd1d3eedf..000000000 --- a/mcp/reclass/classes/system/neutron/control/cluster.yml +++ /dev/null @@ -1,45 +0,0 @@ -classes: -- service.keepalived.cluster.single -- service.haproxy.proxy.single -- service.neutron.control.cluster -- system.haproxy.proxy.listen.openstack.neutron -parameters: - mysql: - server: - database: - neutron: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:cluster_local_address} - rights: all - haproxy: - proxy: - listen: - neutron_api: - type: openstack-service - service_name: neutron - binds: - - address: ${_param:cluster_vip_address} - port: 9696 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - neutron: - server: - plugin: contrail diff --git a/mcp/reclass/classes/system/neutron/control/notification/cadf.yml b/mcp/reclass/classes/system/neutron/control/notification/cadf.yml deleted file mode 100644 index f00f96f31..000000000 --- a/mcp/reclass/classes/system/neutron/control/notification/cadf.yml +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - neutron: - server: - audit: - enabled: true diff --git a/mcp/reclass/classes/system/neutron/control/notification/messagingv2.yml b/mcp/reclass/classes/system/neutron/control/notification/messagingv2.yml deleted file mode 100644 index 70e86181a..000000000 --- a/mcp/reclass/classes/system/neutron/control/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - neutron: - server: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/neutron/control/opencontrail/cluster.yml b/mcp/reclass/classes/system/neutron/control/opencontrail/cluster.yml deleted file mode 100644 index caaaf6d12..000000000 --- a/mcp/reclass/classes/system/neutron/control/opencontrail/cluster.yml +++ /dev/null @@ -1,44 +0,0 @@ -classes: -- service.keepalived.cluster.single -- service.haproxy.proxy.single -- service.neutron.control.cluster -- system.haproxy.proxy.listen.openstack.neutron -parameters: - mysql: - server: - database: - neutron: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:cluster_local_address} - rights: all - neutron: - server: - dns_domain: ${_param:cluster_domain} - database: - host: ${_param:openstack_database_address} - identity: - region: ${_param:openstack_region} - 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} - compute: - host: ${_param:openstack_control_address} - region: ${_param:openstack_region} - backend: - engine: contrail - host: ${_param:opencontrail_control_address} - port: 8082 - user: admin - password: ${_param:keystone_admin_password} - tenant: admin - token: ${_param:keystone_service_token}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml deleted file mode 100644 index dc8e0c53f..000000000 --- a/mcp/reclass/classes/system/neutron/control/openvswitch/cluster.yml +++ /dev/null @@ -1,71 +0,0 @@ -classes: -- service.keepalived.cluster.single -- service.haproxy.proxy.single -- service.neutron.control.cluster -parameters: - _param: - neutron_control_dvr: True - neutron_l3_ha: False - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_tenant_network_types: "flat,vxlan" - neutron: - server: - plugin: ml2 - global_physnet_mtu: ${_param:neutron_global_physnet_mtu} - l3_ha: ${_param:neutron_l3_ha} - dvr: ${_param:neutron_control_dvr} - backend: - engine: ml2 - tenant_network_types: "${_param:neutron_tenant_network_types}" - external_mtu: ${_param:neutron_external_mtu} - mechanism: - ovs: - driver: openvswitch - compute: - region: ${_param:openstack_region} - database: - host: ${_param:openstack_database_address} - identity: - region: ${_param:openstack_region} - message_queue: - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} - mysql: - server: - database: - neutron: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:cluster_local_address} - rights: all - haproxy: - proxy: - listen: - neutron_api: - type: openstack-service - service_name: neutron - binds: - - address: ${_param:cluster_vip_address} - port: 9696 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl02 - host: ${_param:cluster_node02_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 - - name: ctl03 - host: ${_param:cluster_node03_address} - port: 9696 - params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3 diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml deleted file mode 100644 index f7191c772..000000000 --- a/mcp/reclass/classes/system/neutron/control/openvswitch/dpdk.yml +++ /dev/null @@ -1,4 +0,0 @@ -parameters: - neutron: - server: - dpdk: True
\ No newline at end of file diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/single.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/single.yml deleted file mode 100644 index 6601db1e9..000000000 --- a/mcp/reclass/classes/system/neutron/control/openvswitch/single.yml +++ /dev/null @@ -1,45 +0,0 @@ -classes: -- service.neutron.control.single -parameters: - _param: - neutron_control_dvr: True - neutron_l3_ha: False - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_tenant_network_types: "flat,vxlan" - neutron: - server: - plugin: ml2 - global_physnet_mtu: ${_param:neutron_global_physnet_mtu} - l3_ha: ${_param:neutron_l3_ha} - dvr: ${_param:neutron_control_dvr} - backend: - engine: ml2 - tenant_network_types: "${_param:neutron_tenant_network_types}" - external_mtu: ${_param:neutron_external_mtu} - mechanism: - ovs: - driver: openvswitch - compute: - region: ${_param:openstack_region} - database: - host: ${_param:openstack_database_address} - identity: - region: ${_param:openstack_region} - message_queue: - members: - - host: ${_param:openstack_message_queue_node01_address} - mysql: - server: - database: - neutron: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:cluster_local_address} - rights: all
\ No newline at end of file diff --git a/mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml b/mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml deleted file mode 100644 index 38f5d29b0..000000000 --- a/mcp/reclass/classes/system/neutron/control/openvswitch/sriov.yml +++ /dev/null @@ -1,7 +0,0 @@ -parameters: - neutron: - server: - backend: - mechanism: - sriov: - driver: sriovnicswitch diff --git a/mcp/reclass/classes/system/neutron/control/single.yml b/mcp/reclass/classes/system/neutron/control/single.yml deleted file mode 100644 index 663ec329e..000000000 --- a/mcp/reclass/classes/system/neutron/control/single.yml +++ /dev/null @@ -1,22 +0,0 @@ -classes: -- service.neutron.control.single -parameters: - neutron: - server: - database: - host: ${_param:single_address} - mysql: - server: - database: - neutron: - encoding: utf8 - users: - - name: neutron - password: ${_param:mysql_neutron_password} - host: '%' - rights: all - - name: neutron - password: ${_param:mysql_neutron_password} - host: ${_param:single_address} - rights: all - diff --git a/mcp/reclass/classes/system/neutron/gateway/cluster.yml b/mcp/reclass/classes/system/neutron/gateway/cluster.yml deleted file mode 100644 index 99699f7d8..000000000 --- a/mcp/reclass/classes/system/neutron/gateway/cluster.yml +++ /dev/null @@ -1,14 +0,0 @@ -classes: -- service.neutron.gateway.single -parameters: - neutron: - gateway: - dvr: ${_param:neutron_gateway_dvr} - agent_mode: ${_param:neutron_gateway_agent_mode} - backend: - tenant_network_types: ${_param:neutron_tenant_network_types}" - message_queue: - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} diff --git a/mcp/reclass/classes/system/neutron/gateway/notification/messagingv2.yml b/mcp/reclass/classes/system/neutron/gateway/notification/messagingv2.yml deleted file mode 100644 index 6363c3927..000000000 --- a/mcp/reclass/classes/system/neutron/gateway/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - neutron: - gateway: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/nova/compute/cluster.yml b/mcp/reclass/classes/system/nova/compute/cluster.yml deleted file mode 100644 index 4d07a3e9d..000000000 --- a/mcp/reclass/classes/system/nova/compute/cluster.yml +++ /dev/null @@ -1,95 +0,0 @@ -classes: -- service.nova.compute.kvm -parameters: - _param: - nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - nova_compute_virtualization: kvm - nova_compute_avail_zone: - nova_aggregates: [] - nova_compute_ssh_public: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCltIn93BcTMzNK/n2eBze6PyTkmIgdDkeXNR9X4DqE48Va80ojv2pq8xuaBxiNITJzyl+4p4UvTTXo+HmuX8qbHvqgMGXvuPUCpndEfb2r67f6vpMqPwMgBrUg2ZKgN4OsSDHU+H0dia0cEaTjz5pvbUy9lIsSyhrqOUVF9reJq+boAvVEedm8fUqiZuiejAw2D27+rRtdEPgsKMnh3626YEsr963q4rjU/JssV/iKMNu7mk2a+koOrJ+aHvcVU8zJjfA0YghoeVT/I3GLU/MB/4tD/RyR8GM+UYbI4sgAC7ZOCdQyHdJgnEzx3SJIwcS65U0T2XYvn2qXHXqJ9iGZ root@mirantis.com - nova_compute_ssh_private: | - -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEApbSJ/dwXEzMzSv59ngc3uj8k5JiIHQ5HlzUfV+A6hOPFWvNK - I79qavMbmgcYjSEyc8pfuKeFL0016Ph5rl/Kmx76oDBl77j1AqZ3RH29q+u3+r6T - Kj8DIAa1INmSoDeDrEgx1Ph9HYmtHBGk48+ab21MvZSLEsoa6jlFRfa3iavm6AL1 - RHnZvH1KombonowMNg9u/q0bXRD4LCjJ4d+tumBLK/et6uK41PybLFf4ijDbu5pN - mvpKDqyfmh73FVPMyY3wNGIIaHlU/yNxi1PzAf+LQ/0ckfBjPlGGyOLIAAu2TgnU - Mh3SYJxM8d0iSMHEuuVNE9l2L59qlx16ifYhmQIDAQABAoIBAQCYpqbwvE5tm59H - GQb0C8Ykx4LfLD1INx1wiLmlJKYEQihPTw0fvXj1qZvl21+cs9ZcoTRpUbn6B3EA - e9bs8sYc/P75j1x46LSdimkZKZUPygkk72d3ZbElUciOyKCxBDNDBQcTIQ9xpKFa - 2E5Ep72npNMrWqp71r/Qwo20lEIkikIgAFPBgraxn5xIEdo59vzXNZsvyoIRi5p4 - ayH9nWSAXdF1YU3p3ljtHD8o2G/0d2TWGmjrd9vztc6tgXjp0PF60vDNgcJiudBg - oNLDK/e5a44GJxlVDdJ84ESb7GprRStYmddl22xnI1SXlg87+t0QQwzR0CCtWXrz - neXkicHhAoGBANkG9tOZfErhSL/jmsElQTNPcMNQkPiJzEmOIpr6jgSzCusPT/QD - PnVwB42GC5+Zhd4e88BsTzECxPXmKk7r1cBKeJTg/ejgsrSfVAZqMsfhbp3mGOiH - jymF+zC6Urj5q/Zkof8pEFICtyA5zlHvZmsQL9PDiqXIWALki2JvIDPdAoGBAMN2 - O+LWOM9qqwgSMaFY8VUdDdbmLx/ZMGWQ//Tx42WM8SU+cCpGTLDHHR0qC0gnRsV7 - V63DySEwiHn4I1cQ/AMijRxuw4Dkgk2YMRlgsAbVWO7aIlECWjSg+pRjNeA7If4D - 5L/gu6wZIv1vu8/fvOwRpPUzhWjGN5Z0RyvYc7btAoGALNnrmL9XmIIGbuGy0cfJ - OblpLHQyAas4tNrS/ARb5Uy7LOj1NRCWj96fMPhK3qjzqXvsFBBOLWrNGaR/id/j - ROIfGWWGE+KcDAgBbXH1HKnSGn+7FhMt2v79coyPG/s9NqaFdB4gaVJ2VgqcQQKg - v++QcssulCRbS/2/cJBWr2ECgYAJFCDL9G9HEwlGorGzcNIkxeiyppZhwFDDJuz8 - j4+kU9uPg0rqa8F8JINxq1ZCz7A10/jKlWFuLTbpk2Dw1lUeQCiVvX9PKU30FLGT - IC6M4rPyxCb75EQUVbXN1p3WAGkfx0aEsweEgtZhNyNeEGJSBK/Iw8/agfpq/pOf - sboOMQKBgQClKmrAYKWnwdPPka3msyjl/AXDruR4XFvMlOPKbs3nYstolE7eR94F - 7xDyBz85icFU0rceYQetwFH2p5tRL0GcUQhJmJFgIL0OXdCQvRNJrT3iS00N1aUo - SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg== - -----END RSA PRIVATE KEY----- - openssh: - client: - enabled: True - user: {} - stricthostkeychecking: False - nova: - compute: - version: ${_param:nova_version} - enabled: true - virtualization: ${_param:nova_compute_virtualization} - availability_zone: ${_param:nova_compute_avail_zone} - aggregates: ${_param:nova_aggregates} - heal_instance_info_cache_interval: 60 - vncproxy_url: ${_param:nova_vncproxy_url} - bind: - vnc_address: ${_param:cluster_local_address} - vnc_port: 6080 - vnc_name: 0.0.0.0 - database: - engine: mysql - host: ${_param:openstack_database_address} - port: 3306 - name: nova - user: nova - password: ${_param:mysql_nova_password} - identity: - engine: keystone - region: ${_param:openstack_region} - host: ${_param:cluster_vip_address} - port: 35357 - user: nova - password: ${_param:keystone_nova_password} - tenant: service - message_queue: - engine: rabbitmq - port: 5672 - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} - image: - engine: glance - host: ${_param:cluster_vip_address} - port: 9292 - network: - engine: neutron - region: ${_param:openstack_region} - host: ${_param:neutron_service_host} - port: 9696 - user: neutron - tenant: service - password: ${_param:keystone_neutron_password} - user: - public_key: ${_param:nova_compute_ssh_public} - private_key: ${_param:nova_compute_ssh_private} diff --git a/mcp/reclass/classes/system/nova/compute/nfv/cpu_pinning.yml b/mcp/reclass/classes/system/nova/compute/nfv/cpu_pinning.yml deleted file mode 100644 index 3e97838cd..000000000 --- a/mcp/reclass/classes/system/nova/compute/nfv/cpu_pinning.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - nova: - compute: - vcpu_pin_set: ${_param:nova_cpu_pinning} - linux: - system: - kernel: - isolcpu: ${_param:compute_kernel_isolcpu}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/nova/compute/nfv/hugepages.yml b/mcp/reclass/classes/system/nova/compute/nfv/hugepages.yml deleted file mode 100644 index 6778f9481..000000000 --- a/mcp/reclass/classes/system/nova/compute/nfv/hugepages.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - _param: - compute_hugepages_size: 1G - compute_hugepages_mount: /mnt/hugepages_1G - linux: - system: - kernel: - hugepages: - large: - default: true - size: ${_param:compute_hugepages_size} - count: ${_param:compute_hugepages_count} - mount_point: ${_param:compute_hugepages_mount} - nova: - compute: - hugepages: - mount_points: - - path: ${_param:compute_hugepages_mount}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/nova/compute/nfv/sriov.yml b/mcp/reclass/classes/system/nova/compute/nfv/sriov.yml deleted file mode 100644 index b93363c80..000000000 --- a/mcp/reclass/classes/system/nova/compute/nfv/sriov.yml +++ /dev/null @@ -1,21 +0,0 @@ -parameters: - _param: - sriov_nic01_physical_network: physnet1 - sriov_unsafe_interrupts: False - nova: - compute: - sriov: - sriov_nic01: - devname: ${_param:sriov_nic01_device_name} - physical_network: ${_param:sriov_nic01_physical_network} - linux: - system: - kernel: - sriov: True - unsafe_interrupts: ${_param:sriov_unsafe_interrupts} - rc: - local: | - #!/bin/sh -e - # Enabling ${_param:sriov_nic01_numvfs} VFs on ${_param:sriov_nic01_device_name} PF - echo ${_param:sriov_nic01_numvfs} > /sys/class/net/${_param:sriov_nic01_device_name}/device/sriov_numvfs; sleep 2; ip link set ${_param:sriov_nic01_device_name} up - exit 0
\ No newline at end of file diff --git a/mcp/reclass/classes/system/nova/compute/notification/messagingv2.yml b/mcp/reclass/classes/system/nova/compute/notification/messagingv2.yml deleted file mode 100644 index 59ec94dcd..000000000 --- a/mcp/reclass/classes/system/nova/compute/notification/messagingv2.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - nova: - compute: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" - notify_on: - state_change: vm_and_task_state diff --git a/mcp/reclass/classes/system/nova/compute/single.yml b/mcp/reclass/classes/system/nova/compute/single.yml deleted file mode 100644 index f50b93767..000000000 --- a/mcp/reclass/classes/system/nova/compute/single.yml +++ /dev/null @@ -1,91 +0,0 @@ -applications: -- nova -classes: -- service.nova.compute.kvm -parameters: - _param: - nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - nova_compute_ssh_public: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCltIn93BcTMzNK/n2eBze6PyTkmIgdDkeXNR9X4DqE48Va80ojv2pq8xuaBxiNITJzyl+4p4UvTTXo+HmuX8qbHvqgMGXvuPUCpndEfb2r67f6vpMqPwMgBrUg2ZKgN4OsSDHU+H0dia0cEaTjz5pvbUy9lIsSyhrqOUVF9reJq+boAvVEedm8fUqiZuiejAw2D27+rRtdEPgsKMnh3626YEsr963q4rjU/JssV/iKMNu7mk2a+koOrJ+aHvcVU8zJjfA0YghoeVT/I3GLU/MB/4tD/RyR8GM+UYbI4sgAC7ZOCdQyHdJgnEzx3SJIwcS65U0T2XYvn2qXHXqJ9iGZ root@mirantis.com - nova_compute_avail_zone: - nova_compute_ssh_private: | - -----BEGIN RSA PRIVATE KEY----- - MIIEpAIBAAKCAQEApbSJ/dwXEzMzSv59ngc3uj8k5JiIHQ5HlzUfV+A6hOPFWvNK - I79qavMbmgcYjSEyc8pfuKeFL0016Ph5rl/Kmx76oDBl77j1AqZ3RH29q+u3+r6T - Kj8DIAa1INmSoDeDrEgx1Ph9HYmtHBGk48+ab21MvZSLEsoa6jlFRfa3iavm6AL1 - RHnZvH1KombonowMNg9u/q0bXRD4LCjJ4d+tumBLK/et6uK41PybLFf4ijDbu5pN - mvpKDqyfmh73FVPMyY3wNGIIaHlU/yNxi1PzAf+LQ/0ckfBjPlGGyOLIAAu2TgnU - Mh3SYJxM8d0iSMHEuuVNE9l2L59qlx16ifYhmQIDAQABAoIBAQCYpqbwvE5tm59H - GQb0C8Ykx4LfLD1INx1wiLmlJKYEQihPTw0fvXj1qZvl21+cs9ZcoTRpUbn6B3EA - e9bs8sYc/P75j1x46LSdimkZKZUPygkk72d3ZbElUciOyKCxBDNDBQcTIQ9xpKFa - 2E5Ep72npNMrWqp71r/Qwo20lEIkikIgAFPBgraxn5xIEdo59vzXNZsvyoIRi5p4 - ayH9nWSAXdF1YU3p3ljtHD8o2G/0d2TWGmjrd9vztc6tgXjp0PF60vDNgcJiudBg - oNLDK/e5a44GJxlVDdJ84ESb7GprRStYmddl22xnI1SXlg87+t0QQwzR0CCtWXrz - neXkicHhAoGBANkG9tOZfErhSL/jmsElQTNPcMNQkPiJzEmOIpr6jgSzCusPT/QD - PnVwB42GC5+Zhd4e88BsTzECxPXmKk7r1cBKeJTg/ejgsrSfVAZqMsfhbp3mGOiH - jymF+zC6Urj5q/Zkof8pEFICtyA5zlHvZmsQL9PDiqXIWALki2JvIDPdAoGBAMN2 - O+LWOM9qqwgSMaFY8VUdDdbmLx/ZMGWQ//Tx42WM8SU+cCpGTLDHHR0qC0gnRsV7 - V63DySEwiHn4I1cQ/AMijRxuw4Dkgk2YMRlgsAbVWO7aIlECWjSg+pRjNeA7If4D - 5L/gu6wZIv1vu8/fvOwRpPUzhWjGN5Z0RyvYc7btAoGALNnrmL9XmIIGbuGy0cfJ - OblpLHQyAas4tNrS/ARb5Uy7LOj1NRCWj96fMPhK3qjzqXvsFBBOLWrNGaR/id/j - ROIfGWWGE+KcDAgBbXH1HKnSGn+7FhMt2v79coyPG/s9NqaFdB4gaVJ2VgqcQQKg - v++QcssulCRbS/2/cJBWr2ECgYAJFCDL9G9HEwlGorGzcNIkxeiyppZhwFDDJuz8 - j4+kU9uPg0rqa8F8JINxq1ZCz7A10/jKlWFuLTbpk2Dw1lUeQCiVvX9PKU30FLGT - IC6M4rPyxCb75EQUVbXN1p3WAGkfx0aEsweEgtZhNyNeEGJSBK/Iw8/agfpq/pOf - sboOMQKBgQClKmrAYKWnwdPPka3msyjl/AXDruR4XFvMlOPKbs3nYstolE7eR94F - 7xDyBz85icFU0rceYQetwFH2p5tRL0GcUQhJmJFgIL0OXdCQvRNJrT3iS00N1aUo - SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg== - -----END RSA PRIVATE KEY----- - openssh: - client: - enabled: True - user: {} - stricthostkeychecking: False - nova: - compute: - version: ${_param:nova_version} - disable_flow_collection: true - enabled: true - virtualization: kvm - availability_zone: ${_param:nova_compute_avail_zone} - vncproxy_url: ${_param:nova_vncproxy_url} - bind: - vnc_address: ${_param:control_address} - vnc_port: 6080 - vnc_name: 0.0.0.0 - database: - engine: mysql - host: ${_param:control_address} - port: 3306 - name: nova - user: nova - password: ${_param:mysql_nova_password} - identity: - engine: keystone - host: ${_param:control_address} - port: 35357 - user: nova - password: ${_param:keystone_nova_password} - tenant: service - message_queue: - engine: rabbitmq - host: ${_param:control_address} - port: 5672 - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - image: - engine: glance - host: ${_param:control_address} - port: 9292 - network: - engine: neutron - host: ${_param:control_address} - port: 9696 - cache: - engine: memcached - members: - - host: 127.0.0.1 - port: 11211 - user: - public_key: ${_param:nova_compute_ssh_public} - private_key: ${_param:nova_compute_ssh_private} diff --git a/mcp/reclass/classes/system/nova/compute/storage/ceph.yml b/mcp/reclass/classes/system/nova/compute/storage/ceph.yml deleted file mode 100644 index 7cb24cbcc..000000000 --- a/mcp/reclass/classes/system/nova/compute/storage/ceph.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - nova: - compute: - ceph: - enabled: true - ephemeral: yes - rbd_pool: ${_param:nova_storage_pool} - secret_uuid: ${_param:nova_storage_secret_uuid} - client_cinder_key: ${_param:nova_storage_client_key} - rbd_user: ${_param:nova_storage_user}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/nova/control/cluster.yml b/mcp/reclass/classes/system/nova/control/cluster.yml deleted file mode 100644 index d47c5e197..000000000 --- a/mcp/reclass/classes/system/nova/control/cluster.yml +++ /dev/null @@ -1,75 +0,0 @@ -classes: -- service.haproxy.proxy.single -- service.nova.control.cluster -- service.keepalived.cluster.single -- system.haproxy.proxy.listen.openstack.nova -- system.haproxy.proxy.listen.openstack.novnc -parameters: - _param: - nova_vncproxy_url: http://${_param:cluster_vip_address}:6080 - nova_cpu_allocation_ratio: 16.0 - nova_ram_allocation_ratio: 1.5 - nova_disk_allocation_ratio: 1.0 - metadata_password: metadataPass - nova: - controller: - enabled: true - version: ${_param:nova_version} - vncproxy_url: ${_param:nova_vncproxy_url} - security_group: false - dhcp_domain: novalocal - scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,PciPassthroughFilter,NUMATopologyFilter,AggregateInstanceExtraSpecsFilter" - cpu_allocation_ratio: ${_param:nova_cpu_allocation_ratio} - ram_allocation_ratio: ${_param:nova_ram_allocation_ratio} - disk_allocation_ratio: ${_param:nova_disk_allocation_ratio} - workers: 8 - logging: - - engine: syslog - facility: local0 - heka: - enabled: true - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - public_name: ${_param:cluster_vip_address} - novncproxy_address: ${_param:cluster_local_address} - novncproxy_port: 6080 - database: - engine: mysql - host: ${_param:openstack_database_address} - port: 3306 - name: nova - user: nova - password: ${_param:mysql_nova_password} - identity: - engine: keystone - region: ${_param:openstack_region} - host: ${_param:cluster_vip_address} - port: 35357 - user: nova - password: ${_param:keystone_nova_password} - tenant: service - message_queue: - engine: rabbitmq - port: 5672 - user: openstack - password: ${_param:rabbitmq_openstack_password} - virtual_host: '/openstack' - members: - - host: ${_param:openstack_message_queue_node01_address} - - host: ${_param:openstack_message_queue_node02_address} - - host: ${_param:openstack_message_queue_node03_address} - glance: - host: ${_param:cluster_vip_address} - port: 9292 - network: - engine: neutron - region: ${_param:openstack_region} - host: ${_param:neutron_service_host} - user: neutron - password: ${_param:keystone_neutron_password} - port: 9696 - mtu: 1500 - tenant: service - metadata: - password: ${_param:metadata_password} diff --git a/mcp/reclass/classes/system/nova/control/notification/cadf.yml b/mcp/reclass/classes/system/nova/control/notification/cadf.yml deleted file mode 100644 index 2f2b1b19b..000000000 --- a/mcp/reclass/classes/system/nova/control/notification/cadf.yml +++ /dev/null @@ -1,5 +0,0 @@ -parameters: - nova: - controller: - audit: - enabled: true diff --git a/mcp/reclass/classes/system/nova/control/notification/messagingv2.yml b/mcp/reclass/classes/system/nova/control/notification/messagingv2.yml deleted file mode 100644 index 5ed801322..000000000 --- a/mcp/reclass/classes/system/nova/control/notification/messagingv2.yml +++ /dev/null @@ -1,6 +0,0 @@ -parameters: - nova: - controller: - notification: - driver: messagingv2 - topics: "${_param:openstack_notification_topics}" diff --git a/mcp/reclass/classes/system/nova/control/single.yml b/mcp/reclass/classes/system/nova/control/single.yml deleted file mode 100644 index 00182a370..000000000 --- a/mcp/reclass/classes/system/nova/control/single.yml +++ /dev/null @@ -1,7 +0,0 @@ -classes: -- service.nova.control.single -parameters: - nova: - controller: - database: - host: ${_param:single_address} diff --git a/mcp/reclass/classes/system/ntp/client/single.yml b/mcp/reclass/classes/system/ntp/client/single.yml deleted file mode 100644 index 80e70d974..000000000 --- a/mcp/reclass/classes/system/ntp/client/single.yml +++ /dev/null @@ -1,6 +0,0 @@ -classes: -- service.ntp.client -parameters: - ntp: - client: - mode7: true diff --git a/mcp/reclass/classes/system/rabbitmq/server/cluster.yml b/mcp/reclass/classes/system/rabbitmq/server/cluster.yml deleted file mode 100644 index c9de9a8bc..000000000 --- a/mcp/reclass/classes/system/rabbitmq/server/cluster.yml +++ /dev/null @@ -1,4 +0,0 @@ -classes: -- service.rabbitmq.server.cluster -- service.keepalived.cluster.single -- service.haproxy.proxy.single
\ No newline at end of file diff --git a/mcp/reclass/classes/system/rabbitmq/server/single.yml b/mcp/reclass/classes/system/rabbitmq/server/single.yml deleted file mode 100644 index 6183f8197..000000000 --- a/mcp/reclass/classes/system/rabbitmq/server/single.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.rabbitmq.server.single diff --git a/mcp/reclass/classes/system/rabbitmq/server/vhost/catalog.yml b/mcp/reclass/classes/system/rabbitmq/server/vhost/catalog.yml deleted file mode 100644 index 23cb0f216..000000000 --- a/mcp/reclass/classes/system/rabbitmq/server/vhost/catalog.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: - rabbitmq: - server: - host: - '/murano': - enabled: true - user: openstack - password: ${_param:rabbitmq_murano_agent_password} - policies: - - name: HA - pattern: '^(?!amq\.).*' - definition: '{"ha-mode": "all", "message-ttl": 120000}' - admin: - name: admin - password: zeQuooQu47eed8esahpie2Lai8En9ohp - bind: - address: ${_param:single_address} - management: - bind: - address: ${_param:single_address} diff --git a/mcp/reclass/classes/system/rabbitmq/server/vhost/monitoring.yml b/mcp/reclass/classes/system/rabbitmq/server/vhost/monitoring.yml deleted file mode 100644 index af272b9e5..000000000 --- a/mcp/reclass/classes/system/rabbitmq/server/vhost/monitoring.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - rabbitmq: - server: - host: - '/monitor': - enabled: true - user: monitor - password: ${_param:rabbitmq_monitor_password} diff --git a/mcp/reclass/classes/system/rabbitmq/server/vhost/openstack.yml b/mcp/reclass/classes/system/rabbitmq/server/vhost/openstack.yml deleted file mode 100644 index 962bc0adc..000000000 --- a/mcp/reclass/classes/system/rabbitmq/server/vhost/openstack.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: - rabbitmq: - server: - host: - '/': - enabled: true - user: guest - password: guest - policies: - - name: HA - pattern: '^(?!amq\.).*' - definition: '{"ha-mode": "all", "message-ttl": 120000}' - '/openstack': - enabled: true - user: openstack - password: ${_param:rabbitmq_openstack_password} - policies: - - name: HA - pattern: '^(?!amq\.).*' - definition: '{"ha-mode": "all", "message-ttl": 120000}' diff --git a/mcp/reclass/classes/system/reclass/storage/salt.yml b/mcp/reclass/classes/system/reclass/storage/salt.yml deleted file mode 100644 index 0a21cdbfd..000000000 --- a/mcp/reclass/classes/system/reclass/storage/salt.yml +++ /dev/null @@ -1,16 +0,0 @@ -classes: -- service.reclass.storage.salt -- service.git.client -parameters: - reclass: - storage: - data_source: - engine: git - address: '${_param:reclass_data_repository}' - branch: ${_param:reclass_data_revision} - salt: - master: - pillar: - engine: reclass - data_dir: /srv/salt/reclass - diff --git a/mcp/reclass/classes/system/reclass/storage/system/cicd_control_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/cicd_control_cluster.yml deleted file mode 100644 index 547ba6145..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/cicd_control_cluster.yml +++ /dev/null @@ -1,41 +0,0 @@ -parameters: - _param: - cicd_control_node01_hostname: cid01 - cicd_control_node02_hostname: cid02 - cicd_control_node03_hostname: cid03 - reclass: - storage: - node: - cicd_control_node01: - name: ${_param:cicd_control_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.cicd.control.leader - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:cicd_control_node01_address} - keepalived_vip_priority: 103 - cicd_database_id: 1 - cicd_control_node02: - name: ${_param:cicd_control_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.cicd.control.manager - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:cicd_control_node02_address} - keepalived_vip_priority: 102 - cicd_database_id: 2 - cicd_control_node03: - name: ${_param:cicd_control_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.cicd.control.manager - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:cicd_control_node03_address} - keepalived_vip_priority: 101 - cicd_database_id: 3 diff --git a/mcp/reclass/classes/system/reclass/storage/system/infra_idm_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/infra_idm_cluster.yml deleted file mode 100644 index aae23705e..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/infra_idm_cluster.yml +++ /dev/null @@ -1,35 +0,0 @@ -parameters: - _param: - infra_idm_node01_hostname: idm01 - infra_idm_node02_hostname: idm02 - infra_idm_node03_hostname: idm03 - reclass: - storage: - node: - infra_idm_node01: - name: ${_param:infra_idm_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.idm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: centos - single_address: ${_param:infra_idm_node01_address} - infra_idm_node02: - name: ${_param:infra_idm_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.idm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: centos - single_address: ${_param:infra_idm_node02_address} - infra_idm_node03: - name: ${_param:infra_idm_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.idm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: centos - single_address: ${_param:infra_idm_node03_address}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/reclass/storage/system/infra_proxy_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/infra_proxy_cluster.yml deleted file mode 100644 index f7c793228..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/infra_proxy_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - _param: - infra_proxy_node01_hostname: prx01 - infra_proxy_node02_hostname: prx02 - reclass: - storage: - node: - infra_proxy_node01: - name: ${_param:infra_proxy_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.proxy - - cluster.${_param:cluster_name}.stacklight.proxy - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_proxy_node01_address} - keepalived_vip_priority: 102 - infra_proxy_node02: - name: ${_param:infra_proxy_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.proxy - - cluster.${_param:cluster_name}.stacklight.proxy - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_proxy_node02_address} - keepalived_vip_priority: 101 diff --git a/mcp/reclass/classes/system/reclass/storage/system/infra_proxy_single.yml b/mcp/reclass/classes/system/reclass/storage/system/infra_proxy_single.yml deleted file mode 100644 index a245e8c43..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/infra_proxy_single.yml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: - _param: - openstack_proxy_node01_hostname: prx01 - reclass: - storage: - node: - openstack_proxy_node01: - name: ${_param:openstack_proxy_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.proxy - - cluster.${_param:cluster_name}.stacklight.proxy - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_proxy_node01_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/kubernetes_control_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/kubernetes_control_cluster.yml deleted file mode 100644 index 5180ab6db..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/kubernetes_control_cluster.yml +++ /dev/null @@ -1,38 +0,0 @@ -parameters: - _param: - kubernetes_control_node01_hostname: ctl01 - kubernetes_control_node02_hostname: ctl02 - kubernetes_control_node03_hostname: ctl03 - reclass: - storage: - node: - kubernetes_control_node01: - name: ${_param:kubernetes_control_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.kubernetes.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:kubernetes_control_node01_address} - keepalived_vip_priority: 103 - kubernetes_control_node02: - name: ${_param:kubernetes_control_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.kubernetes.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:kubernetes_control_node02_address} - keepalived_vip_priority: 102 - kubernetes_control_node03: - name: ${_param:kubernetes_control_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.kubernetes.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:kubernetes_control_node03_address} - keepalived_vip_priority: 101
\ No newline at end of file diff --git a/mcp/reclass/classes/system/reclass/storage/system/kubernetes_control_single.yml b/mcp/reclass/classes/system/reclass/storage/system/kubernetes_control_single.yml deleted file mode 100644 index c88e3c351..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/kubernetes_control_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - kubernetes_control_node01_hostname: ctl01 - reclass: - storage: - node: - kubernetes_control_node01: - name: ${_param:kubernetes_control_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.kubernetes.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:kubernetes_control_node01_address}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/reclass/storage/system/monitoring_service_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/monitoring_service_cluster.yml deleted file mode 100644 index 630ee32c7..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/monitoring_service_cluster.yml +++ /dev/null @@ -1,35 +0,0 @@ -parameters: - _param: - monitor_node01_hostname: mon01 - monitor_node02_hostname: mon02 - monitor_node03_hostname: mon03 - reclass: - storage: - node: - monitoring_service_node01: - name: ${_param:monitor_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.monitoring.server - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:monitoring_service_node01_address} - monitoring_service_node02: - name: ${_param:monitor_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.monitoring.server - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:monitoring_service_node02_address} - monitoring_service_node03: - name: ${_param:monitor_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.monitoring.server - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:monitoring_service_node03_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/monitoring_service_single.yml b/mcp/reclass/classes/system/reclass/storage/system/monitoring_service_single.yml deleted file mode 100644 index 96805296b..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/monitoring_service_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - monitor_node01_hostname: mon01 - reclass: - storage: - node: - monitoring_service_node01: - name: ${_param:monitor_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.monitoring.server - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:monitoring_service_node01_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/opencontrail_analytics_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/opencontrail_analytics_cluster.yml deleted file mode 100644 index 6a4b7eeb8..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/opencontrail_analytics_cluster.yml +++ /dev/null @@ -1,41 +0,0 @@ -parameters: - _param: - opencontrail_analytics_node01_hostname: nal01 - opencontrail_analytics_node02_hostname: nal02 - opencontrail_analytics_node03_hostname: nal03 - reclass: - storage: - node: - opencontrail_analytics_node01: - name: ${_param:opencontrail_analytics_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.opencontrail.analytics - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:opencontrail_analytics_node01_address} - keepalived_vip_priority: 103 - opencontrail_database_id: 1 - opencontrail_analytics_node02: - name: ${_param:opencontrail_analytics_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.opencontrail.analytics - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:opencontrail_analytics_node02_address} - keepalived_vip_priority: 102 - opencontrail_database_id: 2 - opencontrail_analytics_node03: - name: ${_param:opencontrail_analytics_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.opencontrail.analytics - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:opencontrail_analytics_node03_address} - keepalived_vip_priority: 101 - opencontrail_database_id: 3 diff --git a/mcp/reclass/classes/system/reclass/storage/system/opencontrail_control_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/opencontrail_control_cluster.yml deleted file mode 100644 index d0213b354..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/opencontrail_control_cluster.yml +++ /dev/null @@ -1,41 +0,0 @@ -parameters: - _param: - opencontrail_control_node01_hostname: ntw01 - opencontrail_control_node02_hostname: ntw02 - opencontrail_control_node03_hostname: ntw03 - reclass: - storage: - node: - opencontrail_control_node01: - name: ${_param:opencontrail_control_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.opencontrail.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:opencontrail_control_node01_address} - keepalived_vip_priority: 103 - opencontrail_database_id: 1 - opencontrail_control_node02: - name: ${_param:opencontrail_control_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.opencontrail.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:opencontrail_control_node02_address} - keepalived_vip_priority: 102 - opencontrail_database_id: 2 - opencontrail_control_node03: - name: ${_param:opencontrail_control_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.opencontrail.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:opencontrail_control_node03_address} - keepalived_vip_priority: 101 - opencontrail_database_id: 3 diff --git a/mcp/reclass/classes/system/reclass/storage/system/opencontrail_gateway_single.yml b/mcp/reclass/classes/system/reclass/storage/system/opencontrail_gateway_single.yml deleted file mode 100644 index 52b278659..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/opencontrail_gateway_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - opencontrail_gateway_hostname: gtw01 - reclass: - storage: - node: - opencontrail_gateway_node01: - name: ${_param:opencontrail_gateway_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.opencontrail.gateway - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:opencontrail_gateway_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_benchmark_single.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_benchmark_single.yml deleted file mode 100644 index a676cc328..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_benchmark_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - openstack_benchmark_node01_hostname: bmk01 - reclass: - storage: - node: - openstack_benchmark_node01: - name: ${_param:openstack_benchmark_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.benchmark - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:openstack_benchmark_node01_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_billing_single.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_billing_single.yml deleted file mode 100644 index 5b63ec0f5..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_billing_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - openstack_billing_hostname: bil01 - reclass: - storage: - node: - opencontrail_billing_node01: - name: ${_param:openstack_billing_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.billing - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_billing_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_catalog_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_catalog_cluster.yml deleted file mode 100644 index 332e5d637..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_catalog_cluster.yml +++ /dev/null @@ -1,27 +0,0 @@ -parameters: - _param: - openstack_catalog_node01_hostname: asc01 - openstack_catalog_node02_hostname: asc02 - reclass: - storage: - node: - openstack_catalog_node01: - name: ${_param:openstack_catalog_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.catalog - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: ${_param:openstack_catalog_node01_address} - keepalived_vip_priority: 102 - openstack_catalog_node02: - name: ${_param:openstack_catalog_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.catalog - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: ${_param:openstack_catalog_node02_address} - keepalived_vip_priority: 101 diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_catalog_single.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_catalog_single.yml deleted file mode 100644 index b48ab27a5..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_catalog_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - openstack_catalog_node01_hostname: asc01 - reclass: - storage: - node: - openstack_catalog_node01: - name: ${_param:openstack_catalog_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.catalog - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: ${_param:openstack_catalog_node01_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_compute_multi.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_compute_multi.yml deleted file mode 100644 index 86092db97..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_compute_multi.yml +++ /dev/null @@ -1,25 +0,0 @@ -parameters: - _param: - openstack_compute_node01_hostname: cmp01 - openstack_compute_node02_hostname: cmp02 - reclass: - storage: - node: - openstack_compute_node01: - name: ${_param:openstack_compute_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.compute - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: 172.16.10.105 - openstack_compute_node02: - name: ${_param:openstack_compute_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.compute - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: 172.16.10.106 diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_compute_single.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_compute_single.yml deleted file mode 100644 index 215c0e6f9..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_compute_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - openstack_compute_node01_hostname: cmp01 - reclass: - storage: - node: - openstack_compute_node01: - name: ${_param:openstack_compute_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.compute - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: 172.16.10.105 diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_control_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_control_cluster.yml deleted file mode 100644 index deb25b85a..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_control_cluster.yml +++ /dev/null @@ -1,44 +0,0 @@ -parameters: - _param: - openstack_control_node01_hostname: ctl01 - openstack_control_node02_hostname: ctl02 - openstack_control_node03_hostname: ctl03 - reclass: - storage: - node: - openstack_control_node01: - name: ${_param:openstack_control_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_control_node01_address} - keepalived_vip_priority: 103 - opencontrail_database_id: 1 - rabbitmq_cluster_role: master - openstack_control_node02: - name: ${_param:openstack_control_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_control_node02_address} - keepalived_vip_priority: 102 - opencontrail_database_id: 2 - rabbitmq_cluster_role: slave - openstack_control_node03: - name: ${_param:openstack_control_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.control - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_control_node03_address} - keepalived_vip_priority: 101 - opencontrail_database_id: 3 - rabbitmq_cluster_role: slave diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_control_upgrade_single.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_control_upgrade_single.yml deleted file mode 100644 index 964e06414..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_control_upgrade_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - openstack_upgrade_node01_hostname: upg01 - reclass: - storage: - node: - openstack_control_upgrade_node01: - name: ${_param:openstack_upgrade_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.upgrade - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:openstack_upgrade_node01_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_dashboard_single.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_dashboard_single.yml deleted file mode 100644 index c2915d35f..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_dashboard_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - openstack_proxy_hostname: prx01 - reclass: - storage: - node: - openstack_proxy_node01: - name: ${_param:openstack_proxy_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.dashboard - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: 172.16.10.121 diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_database_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_database_cluster.yml deleted file mode 100644 index 33c6d245c..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_database_cluster.yml +++ /dev/null @@ -1,44 +0,0 @@ -parameters: - _param: - openstack_database_node01_hostname: dbs01 - openstack_database_node02_hostname: dbs02 - openstack_database_node03_hostname: dbs03 - reclass: - storage: - node: - openstack_database_node01: - name: ${_param:openstack_database_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - service.galera.master.cluster - - cluster.${_param:cluster_name}.openstack.database - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_database_node01_address} - keepalived_vip_priority: 103 - mysql_cluster_role: master - openstack_database_node02: - name: ${_param:openstack_database_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - service.galera.slave.cluster - - cluster.${_param:cluster_name}.openstack.database - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_database_node02_address} - keepalived_vip_priority: 102 - mysql_cluster_role: slave - openstack_database_node03: - name: ${_param:openstack_database_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - service.galera.slave.cluster - - cluster.${_param:cluster_name}.openstack.database - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_database_node03_address} - keepalived_vip_priority: 101 - mysql_cluster_role: slave diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_dns_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_dns_cluster.yml deleted file mode 100644 index d134c886f..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_dns_cluster.yml +++ /dev/null @@ -1,27 +0,0 @@ -parameters: - _param: - openstack_dns_node01_hostname: dns01 - openstack_dns_node02_hostname: dns02 - reclass: - storage: - node: - openstack_dns_node01: - name: ${_param:openstack_dns_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.dns - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_dns_node01_address} - keepalived_vip_priority: 110 - openstack_dns_node02: - name: ${_param:openstack_dns_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.dns - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_dns_node02_address} - keepalived_vip_priority: 111 diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_gateway_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_gateway_cluster.yml deleted file mode 100644 index f9d44856f..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_gateway_cluster.yml +++ /dev/null @@ -1,44 +0,0 @@ -parameters: - _param: - openstack_gateway_node01_hostname: gtw01 - openstack_gateway_node02_hostname: gtw02 - openstack_gateway_node03_hostname: gtw03 - - openstack_gateway_node01_tenant_address: ${_param:single_address} - openstack_gateway_node02_tenant_address: ${_param:single_address} - openstack_gateway_node03_tenant_address: ${_param:single_address} - reclass: - storage: - node: - openstack_gateway_node01: - name: ${_param:openstack_gateway_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.gateway - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: ${_param:openstack_gateway_node01_address} - tenant_address: ${_param:openstack_gateway_node01_tenant_address} - openstack_gateway_node02: - name: ${_param:openstack_gateway_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.gateway - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: ${_param:openstack_gateway_node02_address} - tenant_address: ${_param:openstack_gateway_node02_tenant_address} - openstack_gateway_node03: - name: ${_param:openstack_gateway_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.gateway - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: ${_param:openstack_gateway_node03_address} - tenant_address: ${_param:openstack_gateway_node03_tenant_address} - - diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_gateway_single.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_gateway_single.yml deleted file mode 100644 index 6f1857193..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_gateway_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - openstack_gateway_node01_hostname: gtw01 - reclass: - storage: - node: - openstack_gateway_node01: - name: ${_param:openstack_gateway_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.gateway - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: ${_param:linux_system_codename} - single_address: ${_param:openstack_gateway_address}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_message_queue_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_message_queue_cluster.yml deleted file mode 100644 index c6a811f91..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_message_queue_cluster.yml +++ /dev/null @@ -1,41 +0,0 @@ -parameters: - _param: - openstack_message_queue_node01_hostname: msg01 - openstack_message_queue_node02_hostname: msg02 - openstack_message_queue_node03_hostname: msg03 - reclass: - storage: - node: - openstack_message_queue_node01: - name: ${_param:openstack_message_queue_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.message_queue - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_message_queue_node01_address} - keepalived_vip_priority: 103 - rabbitmq_cluster_role: master - openstack_message_queue_node02: - name: ${_param:openstack_message_queue_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.message_queue - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_message_queue_node02_address} - keepalived_vip_priority: 102 - rabbitmq_cluster_role: slave - openstack_message_queue_node03: - name: ${_param:openstack_message_queue_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.message_queue - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_message_queue_node03_address} - keepalived_vip_priority: 101 - rabbitmq_cluster_role: slave diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_proxy_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_proxy_cluster.yml deleted file mode 100644 index 95439fa5c..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_proxy_cluster.yml +++ /dev/null @@ -1,27 +0,0 @@ -parameters: - _param: - openstack_proxy_node01_hostname: prx01 - openstack_proxy_node02_hostname: prx02 - reclass: - storage: - node: - openstack_proxy_node01: - name: ${_param:openstack_proxy_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.proxy - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_proxy_node01_address} - keepalived_vip_priority: 102 - openstack_proxy_node02: - name: ${_param:openstack_proxy_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.proxy - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_proxy_node02_address} - keepalived_vip_priority: 101 diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_proxy_single.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_proxy_single.yml deleted file mode 100644 index 794ca645c..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_proxy_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - openstack_proxy_node01_hostname: prx01 - reclass: - storage: - node: - openstack_proxy_node01: - name: ${_param:openstack_proxy_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.proxy - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_proxy_node01_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/openstack_telemetry_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/openstack_telemetry_cluster.yml deleted file mode 100644 index d184fc924..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/openstack_telemetry_cluster.yml +++ /dev/null @@ -1,38 +0,0 @@ -parameters: - _param: - openstack_telemetry_node01_hostname: mdb01 - openstack_telemetry_node02_hostname: mdb02 - openstack_telemetry_node03_hostname: mdb03 - reclass: - storage: - node: - openstack_telemetry_node01: - name: ${_param:openstack_telemetry_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.telemetry - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_telemetry_node01_address} - keepalived_vip_priority: 103 - openstack_telemetry_node02: - name: ${_param:openstack_telemetry_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.telemetry - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_telemetry_node02_address} - keepalived_vip_priority: 102 - openstack_telemetry_node03: - name: ${_param:openstack_telemetry_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.telemetry - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:openstack_telemetry_node03_address} - keepalived_vip_priority: 101 diff --git a/mcp/reclass/classes/system/reclass/storage/system/physical_control_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/physical_control_cluster.yml deleted file mode 100644 index 4622e09d4..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/physical_control_cluster.yml +++ /dev/null @@ -1,57 +0,0 @@ -parameters: - _param: - infra_kvm_node01_hostname: kvm01 - infra_kvm_node02_hostname: kvm02 - infra_kvm_node03_hostname: kvm03 - - infra_kvm_node01_deploy_address: ${_param:infra_kvm_node01_address} - infra_kvm_node02_deploy_address: ${_param:infra_kvm_node02_address} - infra_kvm_node03_deploy_address: ${_param:infra_kvm_node03_address} - - infra_kvm_node01_storage_address: ${_param:infra_kvm_node01_address} - infra_kvm_node02_storage_address: ${_param:infra_kvm_node02_address} - infra_kvm_node03_storage_address: ${_param:infra_kvm_node03_address} - - infra_kvm_node01_public_address: ${_param:infra_kvm_node01_address} - infra_kvm_node02_public_address: ${_param:infra_kvm_node02_address} - infra_kvm_node03_public_address: ${_param:infra_kvm_node03_address} - - reclass: - storage: - node: - infra_kvm_node01: - name: ${_param:infra_kvm_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node01_address} - deploy_address: ${_param:infra_kvm_node01_deploy_address} - public_address: ${_param:infra_kvm_node01_public_address} - storage_address: ${_param:infra_kvm_node01_storage_address} - infra_kvm_node02: - name: ${_param:infra_kvm_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node02_address} - deploy_address: ${_param:infra_kvm_node02_deploy_address} - public_address: ${_param:infra_kvm_node02_public_address} - storage_address: ${_param:infra_kvm_node02_storage_address} - infra_kvm_node03: - name: ${_param:infra_kvm_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node03_address} - deploy_address: ${_param:infra_kvm_node03_deploy_address} - public_address: ${_param:infra_kvm_node03_public_address} - storage_address: ${_param:infra_kvm_node03_storage_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/physical_control_full.yml b/mcp/reclass/classes/system/reclass/storage/system/physical_control_full.yml deleted file mode 100644 index 0f510a4b1..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/physical_control_full.yml +++ /dev/null @@ -1,153 +0,0 @@ -parameters: - _param: - infra_kvm_node01_hostname: kvm01 - infra_kvm_node02_hostname: kvm02 - infra_kvm_node03_hostname: kvm03 - infra_kvm_node04_hostname: kvm04 - infra_kvm_node05_hostname: kvm05 - infra_kvm_node06_hostname: kvm06 - infra_kvm_node07_hostname: kvm07 - infra_kvm_node08_hostname: kvm08 - infra_kvm_node09_hostname: kvm09 - - infra_kvm_node01_deploy_address: ${_param:infra_kvm_node01_address} - infra_kvm_node02_deploy_address: ${_param:infra_kvm_node02_address} - infra_kvm_node03_deploy_address: ${_param:infra_kvm_node03_address} - infra_kvm_node04_deploy_address: ${_param:infra_kvm_node04_address} - infra_kvm_node05_deploy_address: ${_param:infra_kvm_node05_address} - infra_kvm_node06_deploy_address: ${_param:infra_kvm_node06_address} - infra_kvm_node07_deploy_address: ${_param:infra_kvm_node07_address} - infra_kvm_node08_deploy_address: ${_param:infra_kvm_node08_address} - infra_kvm_node09_deploy_address: ${_param:infra_kvm_node09_address} - - infra_kvm_node01_storage_address: ${_param:infra_kvm_node01_address} - infra_kvm_node02_storage_address: ${_param:infra_kvm_node02_address} - infra_kvm_node03_storage_address: ${_param:infra_kvm_node03_address} - infra_kvm_node04_storage_address: ${_param:infra_kvm_node04_address} - infra_kvm_node05_storage_address: ${_param:infra_kvm_node05_address} - infra_kvm_node06_storage_address: ${_param:infra_kvm_node06_address} - infra_kvm_node07_storage_address: ${_param:infra_kvm_node07_address} - infra_kvm_node08_storage_address: ${_param:infra_kvm_node08_address} - infra_kvm_node09_storage_address: ${_param:infra_kvm_node09_address} - - infra_kvm_node01_public_address: ${_param:infra_kvm_node01_address} - infra_kvm_node02_public_address: ${_param:infra_kvm_node02_address} - infra_kvm_node03_public_address: ${_param:infra_kvm_node03_address} - infra_kvm_node04_public_address: ${_param:infra_kvm_node04_address} - infra_kvm_node05_public_address: ${_param:infra_kvm_node05_address} - infra_kvm_node06_public_address: ${_param:infra_kvm_node06_address} - infra_kvm_node07_public_address: ${_param:infra_kvm_node07_address} - infra_kvm_node08_public_address: ${_param:infra_kvm_node08_address} - infra_kvm_node09_public_address: ${_param:infra_kvm_node09_address} - - reclass: - storage: - node: - infra_kvm_node01: - name: ${_param:infra_kvm_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node01_address} - deploy_address: ${_param:infra_kvm_node01_deploy_address} - public_address: ${_param:infra_kvm_node01_public_address} - storage_address: ${_param:infra_kvm_node01_storage_address} - infra_kvm_node02: - name: ${_param:infra_kvm_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node02_address} - deploy_address: ${_param:infra_kvm_node02_deploy_address} - public_address: ${_param:infra_kvm_node02_public_address} - storage_address: ${_param:infra_kvm_node02_storage_address} - infra_kvm_node03: - name: ${_param:infra_kvm_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node03_address} - deploy_address: ${_param:infra_kvm_node03_deploy_address} - public_address: ${_param:infra_kvm_node03_public_address} - storage_address: ${_param:infra_kvm_node03_storage_address} - infra_kvm_node04: - name: ${_param:infra_kvm_node04_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node04_address} - deploy_address: ${_param:infra_kvm_node04_deploy_address} - public_address: ${_param:infra_kvm_node04_public_address} - storage_address: ${_param:infra_kvm_node04_storage_address} - infra_kvm_node05: - name: ${_param:infra_kvm_node05_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node05_address} - deploy_address: ${_param:infra_kvm_node05_deploy_address} - public_address: ${_param:infra_kvm_node05_public_address} - storage_address: ${_param:infra_kvm_node05_storage_address} - infra_kvm_node06: - name: ${_param:infra_kvm_node06_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node06_address} - deploy_address: ${_param:infra_kvm_node06_deploy_address} - public_address: ${_param:infra_kvm_node06_public_address} - storage_address: ${_param:infra_kvm_node06_storage_address} - infra_kvm_node07: - name: ${_param:infra_kvm_node07_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node07_address} - deploy_address: ${_param:infra_kvm_node07_deploy_address} - public_address: ${_param:infra_kvm_node07_public_address} - storage_address: ${_param:infra_kvm_node07_storage_address} - infra_kvm_node08: - name: ${_param:infra_kvm_node08_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node08_address} - deploy_address: ${_param:infra_kvm_node08_deploy_address} - public_address: ${_param:infra_kvm_node08_public_address} - storage_address: ${_param:infra_kvm_node08_storage_address} - infra_kvm_node09: - name: ${_param:infra_kvm_node09_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node09_address} - deploy_address: ${_param:infra_kvm_node09_deploy_address} - public_address: ${_param:infra_kvm_node09_public_address} - storage_address: ${_param:infra_kvm_node09_storage_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/physical_control_single.yml b/mcp/reclass/classes/system/reclass/storage/system/physical_control_single.yml deleted file mode 100644 index 32f09c307..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/physical_control_single.yml +++ /dev/null @@ -1,21 +0,0 @@ -parameters: - _param: - infra_kvm_node01_hostname: kvm01 - infra_kvm_node01_deploy_address: ${_param:infra_kvm_node01_address} - infra_kvm_node01_storage_address: ${_param:infra_kvm_node01_address} - infra_kvm_node01_public_address: ${_param:infra_kvm_node01_address} - reclass: - storage: - node: - infra_kvm_node01: - name: ${_param:infra_kvm_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.kvm - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: trusty - single_address: ${_param:infra_kvm_node01_address} - deploy_address: ${_param:infra_kvm_node01_deploy_address} - public_address: ${_param:infra_kvm_node01_public_address} - storage_address: ${_param:infra_kvm_node01_storage_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/rsyslog_single.yml b/mcp/reclass/classes/system/reclass/storage/system/rsyslog_single.yml deleted file mode 100644 index a3eefac56..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/rsyslog_single.yml +++ /dev/null @@ -1,15 +0,0 @@ -parameters: - _param: - rsyslog_node01_hostname: rsl01 - reclass: - storage: - node: - rsyslog_node01: - name: ${_param:rsyslog_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.infra.rsyslog - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:rsyslog_node01_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/stacklight_log_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/stacklight_log_cluster.yml deleted file mode 100644 index 4a5da29eb..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/stacklight_log_cluster.yml +++ /dev/null @@ -1,39 +0,0 @@ -parameters: - _param: - stacklight_log_node01_hostname: log01 - stacklight_log_node02_hostname: log02 - stacklight_log_node03_hostname: log03 - reclass: - storage: - node: - stacklight_log_node01: - name: ${_param:stacklight_log_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.log - - cluster.${_param:cluster_name}.stacklight.log_curator - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_log_node01_address} - keepalived_vip_priority: 103 - stacklight_log_node02: - name: ${_param:stacklight_log_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.log - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_log_node02_address} - keepalived_vip_priority: 102 - stacklight_log_node03: - name: ${_param:stacklight_log_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.log - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_log_node03_address} - keepalived_vip_priority: 101 diff --git a/mcp/reclass/classes/system/reclass/storage/system/stacklight_monitor_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/stacklight_monitor_cluster.yml deleted file mode 100644 index f95cf813d..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/stacklight_monitor_cluster.yml +++ /dev/null @@ -1,44 +0,0 @@ -parameters: - _param: - stacklight_monitor_node01_hostname: mon01 - stacklight_monitor_node02_hostname: mon02 - stacklight_monitor_node03_hostname: mon03 - reclass: - storage: - node: - stacklight_monitor_node01: - name: ${_param:stacklight_monitor_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.monitor - params: - redis_cluster_role: 'master' - rabbitmq_cluster_role: 'master' - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node01_address} - keepalived_vip_priority: 103 - stacklight_monitor_node02: - name: ${_param:stacklight_monitor_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.monitor - params: - redis_cluster_role: 'slave' - rabbitmq_cluster_role: 'slave' - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node02_address} - keepalived_vip_priority: 102 - stacklight_monitor_node03: - name: ${_param:stacklight_monitor_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.monitor - params: - redis_cluster_role: 'slave' - rabbitmq_cluster_role: 'slave' - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node03_address} - keepalived_vip_priority: 101 diff --git a/mcp/reclass/classes/system/reclass/storage/system/stacklight_server_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/stacklight_server_cluster.yml deleted file mode 100644 index 26b9ebed9..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/stacklight_server_cluster.yml +++ /dev/null @@ -1,50 +0,0 @@ -parameters: - _param: - stacklight_monitor_node01_hostname: mon01 - stacklight_monitor_node02_hostname: mon02 - stacklight_monitor_node03_hostname: mon03 - reclass: - storage: - node: - stacklight_server_node01: - name: ${_param:stacklight_monitor_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.server - - system.elasticsearch.client.single - - system.grafana.client.single - - system.kibana.client.single - params: - redis_cluster_role: 'master' - rabbitmq_cluster_role: 'master' - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node01_address} - keepalived_vip_priority: 103 - rabbitmq_cluster_role: master - stacklight_server_node02: - name: ${_param:stacklight_monitor_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.server - params: - redis_cluster_role: 'slave' - rabbitmq_cluster_role: 'slave' - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node02_address} - keepalived_vip_priority: 102 - rabbitmq_cluster_role: slave - stacklight_server_node03: - name: ${_param:stacklight_monitor_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.server - params: - redis_cluster_role: 'slave' - rabbitmq_cluster_role: 'slave' - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node03_address} - keepalived_vip_priority: 101 - rabbitmq_cluster_role: slave diff --git a/mcp/reclass/classes/system/reclass/storage/system/stacklight_server_single.yml b/mcp/reclass/classes/system/reclass/storage/system/stacklight_server_single.yml deleted file mode 100644 index 2b397f6de..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/stacklight_server_single.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - _param: - stacklight_monitor_node01_hostname: mon01 - reclass: - storage: - node: - stacklight_server_node01: - name: ${_param:stacklight_monitor_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.server - - system.elasticsearch.client.single - - system.grafana.client.single - - system.kibana.client.single - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node01_address} diff --git a/mcp/reclass/classes/system/reclass/storage/system/stacklight_telemetry_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/stacklight_telemetry_cluster.yml deleted file mode 100644 index 12b1daebb..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/stacklight_telemetry_cluster.yml +++ /dev/null @@ -1,38 +0,0 @@ -parameters: - _param: - stacklight_telemetry_node01_hostname: mtr01 - stacklight_telemetry_node02_hostname: mtr02 - stacklight_telemetry_node03_hostname: mtr03 - reclass: - storage: - node: - stacklight_telemetry_node01: - name: ${_param:stacklight_telemetry_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.telemetry - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_telemetry_node01_address} - keepalived_vip_priority: 103 - stacklight_telemetry_node02: - name: ${_param:stacklight_telemetry_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.telemetry - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_telemetry_node02_address} - keepalived_vip_priority: 102 - stacklight_telemetry_node03: - name: ${_param:stacklight_telemetry_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.telemetry - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_telemetry_node03_address} - keepalived_vip_priority: 101 diff --git a/mcp/reclass/classes/system/reclass/storage/system/stacklight_telemetry_single.yml b/mcp/reclass/classes/system/reclass/storage/system/stacklight_telemetry_single.yml deleted file mode 100644 index bc51b3027..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/stacklight_telemetry_single.yml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: - _param: - stacklight_telemetry_node01_hostname: mtr01 - reclass: - storage: - node: - stacklight_telemetry_node01: - name: ${_param:stacklight_telemetry_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.stacklight.telemetry - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_telemetry_node01_address} - keepalived_vip_priority: 103
\ No newline at end of file diff --git a/mcp/reclass/classes/system/reclass/storage/system/stacklightv2_server_cluster.yml b/mcp/reclass/classes/system/reclass/storage/system/stacklightv2_server_cluster.yml deleted file mode 100644 index c72ac2c81..000000000 --- a/mcp/reclass/classes/system/reclass/storage/system/stacklightv2_server_cluster.yml +++ /dev/null @@ -1,42 +0,0 @@ -parameters: - _param: - stacklight_monitor_node01_hostname: mon01 - stacklight_monitor_node02_hostname: mon02 - stacklight_monitor_node03_hostname: mon03 - reclass: - storage: - node: - stacklight_server_node01: - name: ${_param:stacklight_monitor_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - system.docker.swarm.master - - cluster.${_param:cluster_name}.stacklight.server - - cluster.${_param:cluster_name}.stacklight.client - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node01_address} - keepalived_vip_priority: 103 - stacklight_server_node02: - name: ${_param:stacklight_monitor_node02_hostname} - domain: ${_param:cluster_domain} - classes: - - system.docker.swarm.manager - - cluster.${_param:cluster_name}.stacklight.server - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node02_address} - keepalived_vip_priority: 102 - stacklight_server_node03: - name: ${_param:stacklight_monitor_node03_hostname} - domain: ${_param:cluster_domain} - classes: - - system.docker.swarm.manager - - cluster.${_param:cluster_name}.stacklight.server - params: - salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial - single_address: ${_param:stacklight_monitor_node03_address} - keepalived_vip_priority: 101 diff --git a/mcp/reclass/classes/system/rsyslog/client/single.yml b/mcp/reclass/classes/system/rsyslog/client/single.yml deleted file mode 100644 index bf957d071..000000000 --- a/mcp/reclass/classes/system/rsyslog/client/single.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.rsyslog.client.single diff --git a/mcp/reclass/classes/system/salt/control/cluster/cicd_control_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/cicd_control_cluster.yml deleted file mode 100644 index 82366a8ff..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/cicd_control_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - cicd.control: - cpu: 8 - ram: 32768 - disk_profile: large - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - cid01: - name: ${_param:cicd_control_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: cicd.control - cid02: - name: ${_param:cicd_control_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: cicd.control - cid03: - name: ${_param:cicd_control_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: cicd.control diff --git a/mcp/reclass/classes/system/salt/control/cluster/infra_idm_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/infra_idm_cluster.yml deleted file mode 100644 index 3db87a27e..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/infra_idm_cluster.yml +++ /dev/null @@ -1,26 +0,0 @@ -parameters: - salt: - control: - size: - infra.idm: - cpu: 4 - ram: 8192 - disk_profile: large - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - idm01: - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_centos7_image} - size: infra.idm - idm02: - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_centos7_image} - size: infra.idm - idm03: - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_centos7_image} - size: infra.idm diff --git a/mcp/reclass/classes/system/salt/control/cluster/infra_integration_single.yml b/mcp/reclass/classes/system/salt/control/cluster/infra_integration_single.yml deleted file mode 100644 index 66de89559..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/infra_integration_single.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - salt: - control: - size: - infra.integration: - cpu: 4 - ram: 8192 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - cid01: - name: ${_param:cicd_control_node01_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: infra.integration diff --git a/mcp/reclass/classes/system/salt/control/cluster/infra_proxy_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/infra_proxy_cluster.yml deleted file mode 100644 index f3453ff82..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/infra_proxy_cluster.yml +++ /dev/null @@ -1,24 +0,0 @@ -parameters: - salt: - control: - size: - infra.proxy: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - prx01: - name: ${_param:openstack_proxy_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: infra.proxy - prx02: - name: ${_param:openstack_proxy_node01_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: infra.proxy diff --git a/mcp/reclass/classes/system/salt/control/cluster/infra_proxy_single.yml b/mcp/reclass/classes/system/salt/control/cluster/infra_proxy_single.yml deleted file mode 100644 index 7d092fa27..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/infra_proxy_single.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - salt: - control: - size: - infra.proxy: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - prx01: - name: ${_param:openstack_proxy_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: infra.proxy diff --git a/mcp/reclass/classes/system/salt/control/cluster/infra_storage_single.yml b/mcp/reclass/classes/system/salt/control/cluster/infra_storage_single.yml deleted file mode 100644 index ca8ce26c9..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/infra_storage_single.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - control: - size: - infra.storage: - cpu: 4 - ram: 8192 - disk_profile: xxxlarge - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - sto01: - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: infra.storage diff --git a/mcp/reclass/classes/system/salt/control/cluster/infra_version_control_single.yml b/mcp/reclass/classes/system/salt/control/cluster/infra_version_control_single.yml deleted file mode 100644 index 10e01aba3..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/infra_version_control_single.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - control: - size: - infra.version_control: - cpu: 4 - ram: 8192 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - git01: - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: infra.version_control diff --git a/mcp/reclass/classes/system/salt/control/cluster/opencontrail_analytics_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/opencontrail_analytics_cluster.yml deleted file mode 100644 index 37fb60ac3..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/opencontrail_analytics_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - opencontrail.analytics: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - nal01: - name: ${_param:opencontrail_analytics_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: opencontrail.analytics - nal02: - name: ${_param:opencontrail_analytics_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: opencontrail.analytics - nal03: - name: ${_param:opencontrail_analytics_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: opencontrail.analytics diff --git a/mcp/reclass/classes/system/salt/control/cluster/opencontrail_control_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/opencontrail_control_cluster.yml deleted file mode 100644 index 10ddf5e25..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/opencontrail_control_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - opencontrail.control: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - ntw01: - name: ${_param:opencontrail_control_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: opencontrail.control - ntw02: - name: ${_param:opencontrail_control_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: opencontrail.control - ntw03: - name: ${_param:opencontrail_control_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: opencontrail.control diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_benchmark_single.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_benchmark_single.yml deleted file mode 100644 index 0677320a6..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_benchmark_single.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - control: - size: - openstack.benchmark: - cpu: 2 - ram: 4096 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - bmk01: - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.benchmark diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_billing_single.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_billing_single.yml deleted file mode 100644 index f8dacf725..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_billing_single.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - control: - size: - openstack.billing: - cpu: 4 - ram: 8192 - disk_profile: large - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - bil01: - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.control diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_control_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_control_cluster.yml deleted file mode 100644 index f28a7d069..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_control_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - openstack.control: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - ctl01: - name: ${_param:openstack_control_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.control - ctl02: - name: ${_param:openstack_control_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.control - ctl03: - name: ${_param:openstack_control_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.control diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_database_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_database_cluster.yml deleted file mode 100644 index 2a00308e3..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_database_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - openstack.database: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - dbs01: - name: ${_param:openstack_database_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.database - dbs02: - name: ${_param:openstack_database_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.database - dbs03: - name: ${_param:openstack_database_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.database diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_dns_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_dns_cluster.yml deleted file mode 100644 index 71af5c139..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_dns_cluster.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - salt: - control: - size: - openstack.dns: - cpu: 2 - ram: 4096 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - dns01: - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: openstack.dns - dns02: - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: openstack.dns diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_gateway_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_gateway_cluster.yml deleted file mode 100644 index 5d2a20a77..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_gateway_cluster.yml +++ /dev/null @@ -1,26 +0,0 @@ -parameters: - salt: - control: - size: - openstack.gateway: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - gtw01: - provider: kvm01.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: openstack.gateway - gtw02: - provider: kvm01.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: openstack.gateway - gtw03: - provider: kvm01.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: openstack.gateway diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_gateway_single.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_gateway_single.yml deleted file mode 100644 index e10d1b2ff..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_gateway_single.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - control: - size: - openstack.gateway: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - gtw01: - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: openstack.gateway diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_message_queue_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_message_queue_cluster.yml deleted file mode 100644 index cab5adb2d..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_message_queue_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - openstack.message_queue: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - msg01: - name: ${_param:openstack_message_queue_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.message_queue - msg02: - name: ${_param:openstack_message_queue_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.message_queue - msg03: - name: ${_param:openstack_message_queue_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.message_queue diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_proxy_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_proxy_cluster.yml deleted file mode 100644 index 628dcd885..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_proxy_cluster.yml +++ /dev/null @@ -1,25 +0,0 @@ -parameters: - salt: - control: - size: - openstack.proxy: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - prx01: - name: ${_param:openstack_proxy_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.proxy - prx02: - name: ${_param:openstack_proxy_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.proxy - diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_proxy_single.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_proxy_single.yml deleted file mode 100644 index 8ad0baf6f..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_proxy_single.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - salt: - control: - size: - openstack.proxy: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - prx01: - name: ${_param:openstack_proxy_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.proxy diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_telemetry_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_telemetry_cluster.yml deleted file mode 100644 index 633b98483..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_telemetry_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - openstack.telemetry: - cpu: 4 - ram: 8192 - disk_profile: large - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - mdb01: - name: ${_param:openstack_telemetry_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.telemetry - mdb02: - name: ${_param:openstack_telemetry_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.telemetry - mdb03: - name: ${_param:openstack_telemetry_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_trusty_image} - size: openstack.telemetry diff --git a/mcp/reclass/classes/system/salt/control/cluster/openstack_upgrade_single.yml b/mcp/reclass/classes/system/salt/control/cluster/openstack_upgrade_single.yml deleted file mode 100644 index 3189f3e94..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/openstack_upgrade_single.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - control: - size: - openstack.upgrade: - cpu: 32 - ram: 65536 - disk_profile: medium - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - upg01: - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: openstack.upgrade diff --git a/mcp/reclass/classes/system/salt/control/cluster/rsyslog_single.yml b/mcp/reclass/classes/system/salt/control/cluster/rsyslog_single.yml deleted file mode 100644 index 76cc77f4e..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/rsyslog_single.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - control: - size: - infra.rsyslog: - cpu: 8 - ram: 8192 - disk_profile: xxlarge - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - rsl01: - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: infra.rsyslog diff --git a/mcp/reclass/classes/system/salt/control/cluster/stacklight_log_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/stacklight_log_cluster.yml deleted file mode 100644 index 330e301e1..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/stacklight_log_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - stacklight.log: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - log01: - name: ${_param:stacklight_log_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.log - log02: - name: ${_param:stacklight_log_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.log - log03: - name: ${_param:stacklight_log_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.log diff --git a/mcp/reclass/classes/system/salt/control/cluster/stacklight_server_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/stacklight_server_cluster.yml deleted file mode 100644 index 0055d20a2..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/stacklight_server_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - stacklight.server: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - mon01: - name: ${_param:stacklight_monitor_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.server - mon02: - name: ${_param:stacklight_monitor_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.server - mon03: - name: ${_param:stacklight_monitor_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.server diff --git a/mcp/reclass/classes/system/salt/control/cluster/stacklight_telemetry_cluster.yml b/mcp/reclass/classes/system/salt/control/cluster/stacklight_telemetry_cluster.yml deleted file mode 100644 index bfd14b0d8..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/stacklight_telemetry_cluster.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - salt: - control: - size: - stacklight.telemetry: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - mtr01: - name: ${_param:stacklight_telemetry_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.telemetry - mtr02: - name: ${_param:stacklight_telemetry_node02_hostname} - provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.telemetry - mtr03: - name: ${_param:stacklight_telemetry_node03_hostname} - provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.telemetry diff --git a/mcp/reclass/classes/system/salt/control/cluster/stacklight_telemetry_single.yml b/mcp/reclass/classes/system/salt/control/cluster/stacklight_telemetry_single.yml deleted file mode 100644 index 81fd6fb1d..000000000 --- a/mcp/reclass/classes/system/salt/control/cluster/stacklight_telemetry_single.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - salt: - control: - size: - stacklight.telemetry: - cpu: 32 - ram: 65536 - disk_profile: small - net_profile: default - cluster: - internal: - domain: ${_param:cluster_domain} - engine: virt - node: - mtr01: - name: ${_param:stacklight_telemetry_node01_hostname} - provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} - image: ${_param:salt_control_xenial_image} - size: stacklight.telemetry diff --git a/mcp/reclass/classes/system/salt/control/virt.yml b/mcp/reclass/classes/system/salt/control/virt.yml deleted file mode 100644 index 6ed85378c..000000000 --- a/mcp/reclass/classes/system/salt/control/virt.yml +++ /dev/null @@ -1,47 +0,0 @@ -classes: - - service.libvirt.server.kvm -parameters: - salt: - control: - enabled: True - virt_enabled: True - virt: - nic: - default: - eth1: - bridge: br0 - model: virtio - eth0: - bridge: br1 - model: virtio - disk: - default: - - system: - size: 50000 - xxxsmall: - - system: - size: 8000 - xxsmall: - - system: - size: 15000 - xsmall: - - system: - size: 30000 - small: - - system: - size: 50000 - medium: - - system: - size: 80000 - large: - - system: - size: 100000 - xlarge: - - system: - size: 150000 - xxlarge: - - system: - size: 300000 - xxxlarge: - - system: - size: 500000 diff --git a/mcp/reclass/classes/system/salt/master/api.yml b/mcp/reclass/classes/system/salt/master/api.yml deleted file mode 100644 index b5ede2f8a..000000000 --- a/mcp/reclass/classes/system/salt/master/api.yml +++ /dev/null @@ -1,31 +0,0 @@ -parameters: - _param: - salt_master_api_port: 6969 - salt_master_api_permissions: - - '.*' - - '@local' - - '@wheel' # to allow access to all wheel modules - - '@runner' # to allow access to all runner modules - - '@jobs' # to allow access to the jobs runner and/or wheel mo - salt: - api: - enabled: true - bind: - address: 0.0.0.0 - port: ${_param:salt_master_api_port} - master: - command_timeout: 600 - user: - salt: - permissions: ${_param:salt_master_api_permissions} - linux: - system: - user: - salt: - enabled: true - name: salt - password: ${_param:salt_api_password_hash} - home: /var/tmp/salt - sudo: false - system: true - shell: /bin/false diff --git a/mcp/reclass/classes/system/salt/master/formula/git/ccp.yml b/mcp/reclass/classes/system/salt/master/formula/git/ccp.yml deleted file mode 100644 index c8f1c65bb..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/ccp.yml +++ /dev/null @@ -1,10 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - ccp: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-ccp.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/foundation.yml b/mcp/reclass/classes/system/salt/master/formula/git/foundation.yml deleted file mode 100644 index 7e21699f8..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/foundation.yml +++ /dev/null @@ -1,56 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - aptly: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-aptly.git' - revision: ${_param:salt_master_environment_revision} - bind: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-bind.git' - revision: ${_param:salt_master_environment_revision} - gerrit: - module: - gerrit.py: - enabled: true - state: - gerrit.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-gerrit.git' - revision: ${_param:salt_master_environment_revision} - jenkins: - module: - jenkins_common.py: - enabled: true - state: - jenkins_credential.py: - enabled: true - jenkins_job.py: - enabled: true - jenkins_lib.py: - enabled: true - jenkins_node.py: - enabled: true - jenkins_plugin.py: - enabled: true - jenkins_security.py: - enabled: true - jenkins_slack.py: - enabled: true - jenkins_smtp.py: - enabled: true - jenkins_user.py: - enabled: true - jenkins_view.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-jenkins.git' - revision: ${_param:salt_master_environment_revision} - openldap: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-openldap.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/kubernetes.yml b/mcp/reclass/classes/system/salt/master/formula/git/kubernetes.yml deleted file mode 100644 index fe8ad5dab..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/kubernetes.yml +++ /dev/null @@ -1,22 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - kubernetes: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-kubernetes.git' - revision: ${_param:salt_master_environment_revision} - etcd: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-etcd.git' - revision: ${_param:salt_master_environment_revision} - bird: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-bird.git' - revision: ${_param:salt_master_environment_revision} - docker: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-docker.git' - revision: ${_param:salt_master_environment_revision}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/salt/master/formula/git/monitoring.yml b/mcp/reclass/classes/system/salt/master/formula/git/monitoring.yml deleted file mode 100644 index e0cf30df1..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/monitoring.yml +++ /dev/null @@ -1,14 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - prometheus: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-prometheus.git' - revision: ${_param:salt_master_environment_revision} - telegraf: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-telegraf.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/openstack.yml b/mcp/reclass/classes/system/salt/master/formula/git/openstack.yml deleted file mode 100644 index 36ddfc29b..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/openstack.yml +++ /dev/null @@ -1,122 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - aodh: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-aodh.git' - revision: ${_param:salt_master_environment_revision} - #avinetworks: - # source: git - # address: '${_param:salt_master_environment_repository}/salt-formula-avinetworks.git' - # revision: ${_param:salt_master_environment_revision} - billometer: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-billometer.git' - revision: ${_param:salt_master_environment_revision} - ceilometer: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-ceilometer.git' - revision: ${_param:salt_master_environment_revision} - ceph: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-ceph.git' - revision: ${_param:salt_master_environment_revision} - cinder: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-cinder.git' - revision: ${_param:salt_master_environment_revision} - designate: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-designate.git' - revision: ${_param:salt_master_environment_revision} - galera: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-galera.git' - revision: ${_param:salt_master_environment_revision} - glance: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-glance.git' - revision: ${_param:salt_master_environment_revision} - glusterfs: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-glusterfs.git' - revision: ${_param:salt_master_environment_revision} - haproxy: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-haproxy.git' - revision: ${_param:salt_master_environment_revision} - heat: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-heat.git' - revision: ${_param:salt_master_environment_revision} - horizon: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-horizon.git' - revision: ${_param:salt_master_environment_revision} - keepalived: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-keepalived.git' - revision: ${_param:salt_master_environment_revision} - keystone: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-keystone.git' - revision: ${_param:salt_master_environment_revision} - memcached: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-memcached.git' - revision: ${_param:salt_master_environment_revision} - mongodb: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-mongodb.git' - revision: ${_param:salt_master_environment_revision} - mysql: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-mysql.git' - revision: ${_param:salt_master_environment_revision} - murano: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-murano.git' - revision: ${_param:salt_master_environment_revision} - neutron: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-neutron.git' - revision: ${_param:salt_master_environment_revision} - nginx: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-nginx.git' - revision: ${_param:salt_master_environment_revision} - nova: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-nova.git' - revision: ${_param:salt_master_environment_revision} - opencontrail: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-opencontrail.git' - revision: ${_param:salt_master_environment_revision} - python: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-python.git' - revision: ${_param:salt_master_environment_revision} - rabbitmq: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-rabbitmq.git' - revision: ${_param:salt_master_environment_revision} - sahara: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-sahara.git' - revision: ${_param:salt_master_environment_revision} - statsd: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-statsd.git' - revision: ${_param:salt_master_environment_revision} - supervisor: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-supervisor.git' - revision: ${_param:salt_master_environment_revision} - swift: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-swift.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/oss.yml b/mcp/reclass/classes/system/salt/master/formula/git/oss.yml deleted file mode 100644 index e9273873a..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/oss.yml +++ /dev/null @@ -1,26 +0,0 @@ -parameters: - _param: - salt_master_oss_repository: https://gerrit.mcp.mirantis.net/salt-formulas - salt_master_oss_revision: master - salt: - master: - environment: - dev: - formula: - devops_portal: - module: - devops_utils.py: - enabled: true - source: git - address: '${_param:salt_master_oss_repository}/devops-portal.git' - revision: ${_param:salt_master_oss_revision} - rundeck: - module: - rundeck.py: - enabled: true - state: - rundeck_project.py: - enabled: true - source: git - address: '${_param:salt_master_oss_repository}/rundeck.git' - revision: ${_param:salt_master_oss_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/saltstack.yml b/mcp/reclass/classes/system/salt/master/formula/git/saltstack.yml deleted file mode 100644 index d0ca4535a..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/saltstack.yml +++ /dev/null @@ -1,49 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - backupninja: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-backupninja.git' - revision: ${_param:salt_master_environment_revision} - git: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-git.git' - revision: ${_param:salt_master_environment_revision} - iptables: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-iptables.git' - revision: ${_param:salt_master_environment_revision} - libvirt: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-libvirt.git' - revision: ${_param:salt_master_environment_revision} - linux: - module: - linux_netlink.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-linux.git' - revision: ${_param:salt_master_environment_revision} - ntp: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-ntp.git' - revision: ${_param:salt_master_environment_revision} - openssh: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-openssh.git' - revision: ${_param:salt_master_environment_revision} - reclass: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-reclass.git' - revision: ${_param:salt_master_environment_revision} - salt: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-salt.git' - revision: ${_param:salt_master_environment_revision} - sphinx: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-sphinx.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/git/stacklight.yml b/mcp/reclass/classes/system/salt/master/formula/git/stacklight.yml deleted file mode 100644 index ed07d827e..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/git/stacklight.yml +++ /dev/null @@ -1,83 +0,0 @@ -parameters: - salt: - master: - environment: - dev: - formula: - apache: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-apache.git' - revision: ${_param:salt_master_environment_revision} - collectd: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-collectd.git' - revision: ${_param:salt_master_environment_revision} - elasticsearch: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-elasticsearch.git' - revision: ${_param:salt_master_environment_revision} - grafana: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-grafana.git' - revision: ${_param:salt_master_environment_revision} - state: - grafana3_datasource.py: - enabled: true - grafana3_dashboard.py: - enabled: true - graphite: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-graphite.git' - revision: ${_param:salt_master_environment_revision} - heka: - module: - heka_alarming.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-heka.git' - revision: ${_param:salt_master_environment_revision} - influxdb: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-influxdb.git' - revision: ${_param:salt_master_environment_revision} - java: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-java.git' - revision: ${_param:salt_master_environment_revision} - kibana: - state: - kibana_object.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-kibana.git' - revision: ${_param:salt_master_environment_revision} - nagios: - module: - nagios_alarming.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-nagios.git' - revision: ${_param:salt_master_environment_revision} - postgresql: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-postgresql.git' - revision: ${_param:salt_master_environment_revision} - rabbitmq: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-rabbitmq.git' - revision: ${_param:salt_master_environment_revision} - redis: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-redis.git' - revision: ${_param:salt_master_environment_revision} - rsyslog: - module: - rsyslog_util.py: - enabled: true - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-rsyslog.git' - revision: ${_param:salt_master_environment_revision} - sensu: - source: git - address: '${_param:salt_master_environment_repository}/salt-formula-sensu.git' - revision: ${_param:salt_master_environment_revision} diff --git a/mcp/reclass/classes/system/salt/master/formula/pkg/ccp.yml b/mcp/reclass/classes/system/salt/master/formula/pkg/ccp.yml deleted file mode 100644 index 194beb895..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/pkg/ccp.yml +++ /dev/null @@ -1,9 +0,0 @@ -parameters: - salt: - master: - environment: - prd: - formula: - ccp: - source: pkg - name: salt-formula-ccp diff --git a/mcp/reclass/classes/system/salt/master/formula/pkg/foundation.yml b/mcp/reclass/classes/system/salt/master/formula/pkg/foundation.yml deleted file mode 100644 index 3eed5e900..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/pkg/foundation.yml +++ /dev/null @@ -1,33 +0,0 @@ -parameters: - salt: - master: - environment: - prd: - formula: - aptcacher: - source: pkg - name: salt-formula-aptcacher - aptly: - source: pkg - name: salt-formula-aptly - bind: - source: pkg - name: salt-formula-bind - gerrit: - source: pkg - name: salt-formula-gerrit - jenkins: - source: pkg - name: salt-formula-jenkins - freeipa: - source: pkg - name: salt-formula-freeipa - maas: - source: pkg - name: salt-formula-maas - openldap: - source: pkg - name: salt-formula-openldap - lldp: - source: pkg - name: salt-formula-lldp diff --git a/mcp/reclass/classes/system/salt/master/formula/pkg/kubernetes.yml b/mcp/reclass/classes/system/salt/master/formula/pkg/kubernetes.yml deleted file mode 100644 index 7b3af30d1..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/pkg/kubernetes.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - master: - environment: - prd: - formula: - kubernetes: - source: pkg - name: salt-formula-kubernetes - etcd: - source: pkg - name: salt-formula-etcd - bird: - source: pkg - name: salt-formula-bird - docker: - source: pkg - name: salt-formula-docker
\ No newline at end of file diff --git a/mcp/reclass/classes/system/salt/master/formula/pkg/monitoring.yml b/mcp/reclass/classes/system/salt/master/formula/pkg/monitoring.yml deleted file mode 100644 index 375cbd88b..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/pkg/monitoring.yml +++ /dev/null @@ -1,12 +0,0 @@ -parameters: - salt: - master: - environment: - prd: - formula: - prometheus: - source: pkg - name: salt-formula-prometheus - telegraf: - source: pkg - name: salt-formula-telegraf diff --git a/mcp/reclass/classes/system/salt/master/formula/pkg/openstack.yml b/mcp/reclass/classes/system/salt/master/formula/pkg/openstack.yml deleted file mode 100644 index b1222d1e6..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/pkg/openstack.yml +++ /dev/null @@ -1,93 +0,0 @@ -parameters: - salt: - master: - environment: - prd: - formula: - aodh: - source: pkg - name: salt-formula-aodh - #avinetworks: - # source: pkg - # name: salt-formula-avinetworks - billometer: - source: pkg - name: salt-formula-billometer - ceilometer: - source: pkg - name: salt-formula-ceilometer - ceph: - source: pkg - name: salt-formula-ceph - cinder: - source: pkg - name: salt-formula-cinder - galera: - source: pkg - name: salt-formula-galera - glance: - source: pkg - name: salt-formula-glance - glusterfs: - source: pkg - name: salt-formula-glusterfs - designate: - source: pkg - name: salt-formula-designate - haproxy: - source: pkg - name: salt-formula-haproxy - heat: - source: pkg - name: salt-formula-heat - horizon: - source: pkg - name: salt-formula-horizon - keepalived: - source: pkg - name: salt-formula-keepalived - keystone: - source: pkg - name: salt-formula-keystone - memcached: - source: pkg - name: salt-formula-memcached - mongodb: - source: pkg - name: salt-formula-mongodb - mysql: - source: pkg - name: salt-formula-mysql - murano: - source: pkg - name: salt-formula-murano - neutron: - source: pkg - name: salt-formula-neutron - nginx: - source: pkg - name: salt-formula-nginx - nova: - source: pkg - name: salt-formula-nova - opencontrail: - source: pkg - name: salt-formula-opencontrail - python: - source: pkg - name: salt-formula-python - rabbitmq: - source: pkg - name: salt-formula-rabbitmq - sahara: - source: pkg - name: salt-formula-sahara - statsd: - source: pkg - name: salt-formula-statsd - supervisor: - source: pkg - name: salt-formula-supervisor - swift: - source: pkg - name: salt-formula-swift diff --git a/mcp/reclass/classes/system/salt/master/formula/pkg/oss.yml b/mcp/reclass/classes/system/salt/master/formula/pkg/oss.yml deleted file mode 100644 index 45739d23e..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/pkg/oss.yml +++ /dev/null @@ -1,12 +0,0 @@ -parameters: - salt: - master: - environment: - prd: - formula: - devops_portal: - source: pkg - name: salt-formula-devops-portal - rundeck: - source: pkg - name: salt-formula-rundeck diff --git a/mcp/reclass/classes/system/salt/master/formula/pkg/saltstack.yml b/mcp/reclass/classes/system/salt/master/formula/pkg/saltstack.yml deleted file mode 100644 index eeff26b9e..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/pkg/saltstack.yml +++ /dev/null @@ -1,39 +0,0 @@ -parameters: - salt: - master: - environment: - prd: - formula: - backupninja: - source: pkg - name: salt-formula-backupninja - git: - source: pkg - name: salt-formula-git - iptables: - source: pkg - name: salt-formula-iptables - libvirt: - source: pkg - name: salt-formula-libvirt - linux: - source: pkg - name: salt-formula-linux - nginx: - source: pkg - name: salt-formula-nginx - ntp: - source: pkg - name: salt-formula-ntp - openssh: - source: pkg - name: salt-formula-openssh - reclass: - source: pkg - name: salt-formula-reclass - salt: - source: pkg - name: salt-formula-salt - sphinx: - source: pkg - name: salt-formula-sphinx diff --git a/mcp/reclass/classes/system/salt/master/formula/pkg/stacklight.yml b/mcp/reclass/classes/system/salt/master/formula/pkg/stacklight.yml deleted file mode 100644 index 4fe75c0f0..000000000 --- a/mcp/reclass/classes/system/salt/master/formula/pkg/stacklight.yml +++ /dev/null @@ -1,54 +0,0 @@ -parameters: - salt: - master: - environment: - prd: - formula: - apache: - source: pkg - name: salt-formula-apache - collectd: - source: pkg - name: salt-formula-collectd - elasticsearch: - source: pkg - name: salt-formula-elasticsearch - grafana: - source: pkg - name: salt-formula-grafana - graphite: - source: pkg - name: salt-formula-graphite - heka: - source: pkg - name: salt-formula-heka - influxdb: - source: pkg - name: salt-formula-influxdb - java: - source: pkg - name: salt-formula-java - kibana: - source: pkg - name: salt-formula-kibana - #nagios: - # source: pkg - # name: salt-formula-nagios - postgresql: - source: pkg - name: salt-formula-postgresql - rabbitmq: - source: pkg - name: salt-formula-rabbitmq - redis: - source: pkg - name: salt-formula-redis - rsyslog: - source: pkg - name: salt-formula-rsyslog - sensu: - source: pkg - name: salt-formula-sensu - nagios: - source: pkg - name: salt-formula-nagios diff --git a/mcp/reclass/classes/system/salt/master/git.yml b/mcp/reclass/classes/system/salt/master/git.yml deleted file mode 100644 index 267bdb192..000000000 --- a/mcp/reclass/classes/system/salt/master/git.yml +++ /dev/null @@ -1,14 +0,0 @@ -classes: -- system.salt.master.single -- system.salt.master.formula.git.ccp -- system.salt.master.formula.git.foundation -- system.salt.master.formula.git.kubernetes -- system.salt.master.formula.git.openstack -- system.salt.master.formula.git.oss -- system.salt.master.formula.git.saltstack -- system.salt.master.formula.git.stacklight -- system.salt.master.formula.git.monitoring -parameters: - _param: - salt_master_environment_repository: "https://github.com/salt-formulas" - salt_master_environment_revision: master diff --git a/mcp/reclass/classes/system/salt/master/pkg.yml b/mcp/reclass/classes/system/salt/master/pkg.yml deleted file mode 100644 index 1001d49de..000000000 --- a/mcp/reclass/classes/system/salt/master/pkg.yml +++ /dev/null @@ -1,11 +0,0 @@ -classes: -- system.salt.master.single -- system.salt.master.formula.pkg.ccp -- system.salt.master.formula.pkg.foundation -- system.salt.master.formula.pkg.kubernetes -- system.salt.master.formula.pkg.openstack -- system.salt.master.formula.pkg.oss -- system.salt.master.formula.pkg.saltstack -- system.salt.master.formula.pkg.stacklight -- system.salt.master.formula.pkg.monitoring -- system.linux.system.repo.mcp.salt diff --git a/mcp/reclass/classes/system/salt/master/single.yml b/mcp/reclass/classes/system/salt/master/single.yml deleted file mode 100644 index 9764a970a..000000000 --- a/mcp/reclass/classes/system/salt/master/single.yml +++ /dev/null @@ -1,19 +0,0 @@ -classes: -- service.git.client -- service.salt.master.single -parameters: - linux: - system: - sysctl: - net.core.rmem_max: 16777216 - net.core.wmem_max: 16777216 - net.ipv4.tcp_rmem: 4096 87380 16777216 - net.ipv4.tcp_wmem: 4096 87380 16777216 - salt: - master: - accept_policy: auto_accept - worker_threads: 40 - command_timeout: 10 - peer: - '.*': - - x509.sign_remote_certificate diff --git a/mcp/reclass/classes/system/salt/minion/ca/salt_master.yml b/mcp/reclass/classes/system/salt/minion/ca/salt_master.yml deleted file mode 100644 index 87cd6e6c0..000000000 --- a/mcp/reclass/classes/system/salt/minion/ca/salt_master.yml +++ /dev/null @@ -1,29 +0,0 @@ -parameters: - _param: - salt_minion_ca_common_name: Salt Master CA - salt_minion_ca_country: cz - salt_minion_ca_locality: Prague - salt_minion_ca_organization: Mirantis - salt_minion_ca_days_valid_authority: 3650 - salt_minion_ca_days_valid_certificate: 365 - salt: - minion: - ca: - salt_master_ca: - common_name: ${_param:salt_minion_ca_common_name} - country: ${_param:salt_minion_ca_country} - locality: ${_param:salt_minion_ca_locality} - organization: ${_param:salt_minion_ca_organization} - signing_policy: - cert_server: - type: v3_edge_cert_server - minions: '*' - cert_client: - type: v3_edge_cert_client - minions: '*' - cert_open: - type: v3_edge_cert_open - minions: '*' - days_valid: - authority: ${_param:salt_minion_ca_days_valid_authority} - certificate: ${_param:salt_minion_ca_days_valid_certificate} diff --git a/mcp/reclass/classes/system/salt/minion/cert/ceph/init.yml b/mcp/reclass/classes/system/salt/minion/cert/ceph/init.yml deleted file mode 100644 index 8b2e61ce8..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/ceph/init.yml +++ /dev/null @@ -1,12 +0,0 @@ -parameters: - _param: - salt_minion_ca_authority: salt_master_ca - salt: - minion: - cert: - ceph: - host: ${_param:salt_minion_ca_host} - signing_policy: cert_server - authority: ${_param:salt_minion_ca_authority} - common_name: ${_param:cluster_public_host} - diff --git a/mcp/reclass/classes/system/salt/minion/cert/ceph/openstack.yml b/mcp/reclass/classes/system/salt/minion/cert/ceph/openstack.yml deleted file mode 100644 index 664352da9..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/ceph/openstack.yml +++ /dev/null @@ -1,11 +0,0 @@ -classes: -- system.salt.minion.cert.ceph -parameters: - _param: - salt_pki_ceph_alt_names: IP:${_param:cluster_public_host},DNS:${_param:cluster_public_host} - salt: - minion: - cert: - ceph: - common_name: ceph - alternative_names: IP:127.0.0.1,${_param:salt_pki_ceph_alt_names} diff --git a/mcp/reclass/classes/system/salt/minion/cert/ceph/pki.yml b/mcp/reclass/classes/system/salt/minion/cert/ceph/pki.yml deleted file mode 100644 index 37e4fc5ad..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/ceph/pki.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - salt: - minion: - cert: - ceph: - key_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:ceph:common_name}.key - cert_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:ceph:common_name}.crt - all_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:ceph:common_name}-chain-with-key.pem diff --git a/mcp/reclass/classes/system/salt/minion/cert/etcd_client.yml b/mcp/reclass/classes/system/salt/minion/cert/etcd_client.yml deleted file mode 100644 index 90b41da7f..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/etcd_client.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - minion: - cert: - etcd_client: - host: ${_param:salt_minion_ca_host} - authority: ${_param:salt_minion_ca_authority} - common_name: ${linux:system:name} - signing_policy: cert_open - alternative_names: IP:${_param:cluster_local_address},DNS:${linux:system:name},DNS:${linux:network:fqdn} - extended_key_usage: clientAuth - key_usage: "digitalSignature,nonRepudiation,keyEncipherment" - key_file: /var/lib/etcd/etcd-client.key - cert_file: /var/lib/etcd/etcd-client.crt - all_file: /var/lib/etcd/etcd-client.pem - ca_file: /var/lib/etcd/ca.pem - user: etcd - group: etcd diff --git a/mcp/reclass/classes/system/salt/minion/cert/etcd_server.yml b/mcp/reclass/classes/system/salt/minion/cert/etcd_server.yml deleted file mode 100644 index ea26a4052..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/etcd_server.yml +++ /dev/null @@ -1,18 +0,0 @@ -parameters: - salt: - minion: - cert: - etcd_server: - host: ${_param:salt_minion_ca_host} - authority: ${_param:salt_minion_ca_authority} - common_name: ${linux:system:name} - signing_policy: cert_open - alternative_names: IP:127.0.0.1,IP:${_param:cluster_vip_address},IP:${_param:cluster_local_address},DNS:${linux:system:name},DNS:${linux:network:fqdn} - extended_key_usage: serverAuth,clientAuth - key_usage: "digitalSignature,nonRepudiation,keyEncipherment" - key_file: /var/lib/etcd/etcd-server.key - cert_file: /var/lib/etcd/etcd-server.crt - all_file: /var/lib/etcd/etcd-server.pem - ca_file: /var/lib/etcd/ca.pem - user: etcd - group: etcd diff --git a/mcp/reclass/classes/system/salt/minion/cert/k8s_client.yml b/mcp/reclass/classes/system/salt/minion/cert/k8s_client.yml deleted file mode 100644 index 06d83c4a1..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/k8s_client.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - salt: - minion: - cert: - k8s_client: - host: ${_param:salt_minion_ca_host} - authority: ${_param:salt_minion_ca_authority} - key_file: /etc/kubernetes/ssl/kubelet-client.key - cert_file: /etc/kubernetes/ssl/kubelet-client.crt - ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt - common_name: kubelet-client - signing_policy: cert_client - alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/salt/minion/cert/k8s_client_single.yml b/mcp/reclass/classes/system/salt/minion/cert/k8s_client_single.yml deleted file mode 100644 index 179d534be..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/k8s_client_single.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - salt: - minion: - cert: - k8s_client: - host: ${_param:salt_minion_ca_host} - authority: ${_param:salt_minion_ca_authority} - key_file: /etc/kubernetes/ssl/kubelet-client.key - cert_file: /etc/kubernetes/ssl/kubelet-client.crt - ca_file: /etc/kubernetes/ssl/ca-kubernetes.crt - common_name: kubelet-client - signing_policy: cert_client - alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address}
\ No newline at end of file diff --git a/mcp/reclass/classes/system/salt/minion/cert/k8s_server.yml b/mcp/reclass/classes/system/salt/minion/cert/k8s_server.yml deleted file mode 100644 index 603d3691d..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/k8s_server.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - salt: - minion: - cert: - k8s_server: - host: ${_param:salt_minion_ca_host} - authority: ${_param:salt_minion_ca_authority} - common_name: kubernetes-server - key_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.key - cert_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.crt - all_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.pem - signing_policy: cert_server - alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address},DNS:kubernetes.default,DNS:kubernetes.default.svc diff --git a/mcp/reclass/classes/system/salt/minion/cert/k8s_server_single.yml b/mcp/reclass/classes/system/salt/minion/cert/k8s_server_single.yml deleted file mode 100644 index 33637e4a8..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/k8s_server_single.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - salt: - minion: - cert: - k8s_server: - host: ${_param:salt_minion_ca_host} - authority: ${_param:salt_minion_ca_authority} - common_name: kubernetes-server - key_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.key - cert_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.crt - all_file: /srv/salt/env/${_param:salt_master_base_environment}/_certs/kubernetes/kubernetes-server.pem - signing_policy: cert_server - alternative_names: IP:${_param:control_address},IP:${_param:kubernetes_internal_api_address} diff --git a/mcp/reclass/classes/system/salt/minion/cert/prometheus_server.yml b/mcp/reclass/classes/system/salt/minion/cert/prometheus_server.yml deleted file mode 100644 index 30a0711a1..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/prometheus_server.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - salt: - minion: - cert: - prometheus_server: - host: ${_param:salt_minion_ca_host} - authority: ${_param:salt_minion_ca_authority} - key_file: ${prometheus:server:dir:config}/prometheus-server.key - cert_file: ${prometheus:server:dir:config}/prometheus-server.crt - common_name: prometheus-server - signing_policy: cert_client - alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address} - mode: '0444' diff --git a/mcp/reclass/classes/system/salt/minion/cert/proxy/cicd.yml b/mcp/reclass/classes/system/salt/minion/cert/proxy/cicd.yml deleted file mode 100644 index 5fb5b280a..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/proxy/cicd.yml +++ /dev/null @@ -1,15 +0,0 @@ -classes: -- system.salt.minion.cert.proxy -parameters: - salt: - minion: - cert: - proxy: - alternative_names: "DNS:${_param:cluster_public_host}, DNS:*.${_param:cluster_public_host}, IP:${_param:control_vip_address}, IP:${_param:single_address}" - key_file: /etc/haproxy/ssl/${_param:cluster_public_host}.key - cert_file: /etc/haproxy/ssl/${_param:cluster_public_host}.crt - all_file: /etc/haproxy/ssl/${_param:cluster_public_host}-all.pem - ca_file: /etc/haproxy/ssl/${_param:salt_minion_ca_authority}-ca.crt - user: root - group: haproxy - mode: 640
\ No newline at end of file diff --git a/mcp/reclass/classes/system/salt/minion/cert/proxy/init.yml b/mcp/reclass/classes/system/salt/minion/cert/proxy/init.yml deleted file mode 100644 index fac9aa554..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/proxy/init.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - _param: - salt_minion_ca_authority: salt_master_ca - salt: - minion: - cert: - proxy: - host: ${_param:salt_minion_ca_host} - signing_policy: cert_server - authority: ${_param:salt_minion_ca_authority} - common_name: ${_param:cluster_public_host} diff --git a/mcp/reclass/classes/system/salt/minion/cert/proxy/openstack.yml b/mcp/reclass/classes/system/salt/minion/cert/proxy/openstack.yml deleted file mode 100644 index 627d96bd6..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/proxy/openstack.yml +++ /dev/null @@ -1,11 +0,0 @@ -classes: -- system.salt.minion.cert.proxy -parameters: - _param: - salt_pki_proxy_alt_names: IP:${_param:cluster_public_host},DNS:${_param:cluster_public_host},DNS:proxy.${_param:cluster_public_host},DNS:horizon.${_param:cluster_public_host} - salt: - minion: - cert: - proxy: - common_name: proxy - alternative_names: IP:127.0.0.1,${_param:salt_pki_proxy_alt_names} diff --git a/mcp/reclass/classes/system/salt/minion/cert/proxy/pki.yml b/mcp/reclass/classes/system/salt/minion/cert/proxy/pki.yml deleted file mode 100644 index 731aea625..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/proxy/pki.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - salt: - minion: - cert: - proxy: - key_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:proxy:common_name}.key - cert_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:proxy:common_name}.crt - all_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:proxy:common_name}-chain-with-key.pem diff --git a/mcp/reclass/classes/system/salt/minion/cert/swift/init.yml b/mcp/reclass/classes/system/salt/minion/cert/swift/init.yml deleted file mode 100644 index 28859cf23..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/swift/init.yml +++ /dev/null @@ -1,11 +0,0 @@ -parameters: - _param: - salt_minion_ca_authority: salt_master_ca - salt: - minion: - cert: - swift: - host: ${_param:salt_minion_ca_host} - signing_policy: cert_server - authority: ${_param:salt_minion_ca_authority} - common_name: ${_param:cluster_public_host} diff --git a/mcp/reclass/classes/system/salt/minion/cert/swift/openstack.yml b/mcp/reclass/classes/system/salt/minion/cert/swift/openstack.yml deleted file mode 100644 index 5560e1b46..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/swift/openstack.yml +++ /dev/null @@ -1,11 +0,0 @@ -classes: -- system.salt.minion.cert.swift -parameters: - _param: - salt_pki_swift_alt_names: IP:${_param:cluster_public_host},DNS:${_param:cluster_public_host} - salt: - minion: - cert: - swift: - common_name: swift - alternative_names: IP:127.0.0.1,${_param:salt_pki_swift_alt_names} diff --git a/mcp/reclass/classes/system/salt/minion/cert/swift/pki.yml b/mcp/reclass/classes/system/salt/minion/cert/swift/pki.yml deleted file mode 100644 index 3195e48fc..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/swift/pki.yml +++ /dev/null @@ -1,8 +0,0 @@ -parameters: - salt: - minion: - cert: - swift: - key_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:swift:common_name}.key - cert_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:swift:common_name}.crt - all_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:swift:common_name}-chain-with-key.pem diff --git a/mcp/reclass/classes/system/salt/minion/cert/wildcard/init.yml b/mcp/reclass/classes/system/salt/minion/cert/wildcard/init.yml deleted file mode 100644 index 29748958c..000000000 --- a/mcp/reclass/classes/system/salt/minion/cert/wildcard/init.yml +++ /dev/null @@ -1,16 +0,0 @@ -parameters: - _param: - salt_minion_ca_authority: salt_master_ca - salt_pki_wildcard_alt_names: IP:${_param:cluster_public_host},DNS:${_param:cluster_public_host},DNS:*.${_param:cluster_public_host},DNS:${_param:cluster_domain},DNS:*.${_param:cluster_domain} - salt: - minion: - cert: - proxy: - host: ${_param:salt_minion_ca_host} - signing_policy: cert_server - authority: ${_param:salt_minion_ca_authority} - common_name: wildcard - alternative_names: IP:127.0.0.1,${_param:salt_pki_wildcard_alt_names} - key_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:wildcard:common_name}.key - cert_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:wildcard:common_name}.crt - all_file: /srv/salt/pki/${_param:cluster_name}/${salt:minion:cert:wildcard:common_name}-chain-with-key.pem diff --git a/mcp/reclass/classes/system/salt/minion/master.yml b/mcp/reclass/classes/system/salt/minion/master.yml deleted file mode 100644 index fbeb1782d..000000000 --- a/mcp/reclass/classes/system/salt/minion/master.yml +++ /dev/null @@ -1,2 +0,0 @@ -classes: -- service.salt.minion.master diff --git a/mcp/reclass/classes/system/salt/minion/masters.yml b/mcp/reclass/classes/system/salt/minion/masters.yml deleted file mode 100644 index 829474ac7..000000000 --- a/mcp/reclass/classes/system/salt/minion/masters.yml +++ /dev/null @@ -1,7 +0,0 @@ -parameters: - salt: - minion: - master_type: failover - masters: - - host: ${_param:infra_config_deploy_address} - - host: ${_param:infra_config_address} diff --git a/mcp/reclass/scripts/infra.sh b/mcp/reclass/scripts/infra.sh index 182d90692..7f5c210db 100755 --- a/mcp/reclass/scripts/infra.sh +++ b/mcp/reclass/scripts/infra.sh @@ -5,6 +5,10 @@ SALT_MASTER=192.168.10.100 BASE_IMAGE=https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img declare -A NODES=( [cfg01]=4096 [ctl01]=6144 [ctl02]=6144 [ctl03]=6144 [gtw01]=2048 [cmp01]=2048 ) +# get required packages +apt-get install -y mkisofs curl virtinst cpu-checker qemu-kvm + +# generate ssh key [ -f $SSH_KEY ] || ssh-keygen -f $SSH_KEY -N '' # get base image @@ -60,6 +64,9 @@ done CONNECTION_ATTEMPTS=20 SLEEP=15 +# refresh salt master host key +ssh-keygen -R $SALT_MASTER + # wait until ssh on Salt master is available echo "Attempting to ssh to Salt master ..." ATTEMPT=1 @@ -71,5 +78,6 @@ while (($ATTEMPT <= $CONNECTION_ATTEMPTS)); do (*) echo "${ATTEMPT}/${CONNECTION_ATTEMPTS}> ssh server ain't ready yet, waiting for ${SLEEP} seconds ..." ;; esac sleep $SLEEP + ssh-keyscan -t ecdsa $SALT_MASTER >> ~/.ssh/known_hosts ((ATTEMPT+=1)) done diff --git a/mcp/reclass/scripts/salt.sh b/mcp/reclass/scripts/salt.sh index c202ab574..6495bbce2 100755 --- a/mcp/reclass/scripts/salt.sh +++ b/mcp/reclass/scripts/salt.sh @@ -11,8 +11,8 @@ ssh -i mcp.rsa ubuntu@192.168.10.100 bash -s << SALT_INSTALL_END apt-get install -y git curl subversion svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts - git clone --depth=1 https://git.opnfv.org/fuel - ln -s fuel/mcp/reclass /srv/salt/reclass + git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel + ln -s $(pwd)/fuel/mcp/reclass /srv/salt/reclass cd /srv/salt/scripts MASTER_HOSTNAME=cfg01.virtual-mcp-ocata-ovs.local ./salt-master-init.sh |