Merge "[pike-ovs] Simplify external network scheme"
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
index eb5a26b..6235e8f 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
@@ -16,6 +16,7 @@
- system.keystone.client.service.nova21
- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.stacklightv2_server_cluster
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
index f73efbc..1fac8c1 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
@@ -28,6 +28,9 @@
- system.ceilometer.server.backend.influxdb
- system.aodh.server.cluster
- system.heka.ceilometer_collector.single
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
- system.galera.server.cluster
- system.galera.server.database.aodh
- system.galera.server.database.ceilometer
@@ -37,6 +40,7 @@
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
+- system.galera.server.database.designate
- cluster.virtual-mcp-mitaka-dvr
parameters:
@@ -109,3 +113,49 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
+ bind:
+ server:
+ control:
+ mgmt:
+ enabled: true
+ bind:
+ address: ${_param:single_address}
+ port: 953
+ allow:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ keys:
+ - designate
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node02_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node02_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node03_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node03_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ quota:
+ zones: ${_param:designate_quota_zones}
+ worker:
+ enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/init.yml
index 4513980..67256b5 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/init.yml
@@ -64,6 +64,36 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
+ designate_admin_api_enabled: true
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: bind9
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ designate_pool_target_options:
+ host: ${_param:openstack_control_node01_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node01_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ designate_version: ${_param:openstack_version}
+ designate_worker_enabled: false
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}
keystone_version: ${_param:openstack_version}
@@ -85,6 +115,7 @@
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
glusterfs_service_host: ${_param:cluster_vip_address}
+ designate_service_host: ${_param:cluster_vip_address}
metadata_password: password
mysql_admin_user: root
mysql_admin_password: workshop
@@ -97,6 +128,7 @@
mysql_neutron_password: workshop
mysql_nova_password: workshop
mysql_aodh_password: workshop
+ mysql_designate_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_aodh_password: workshop
@@ -107,6 +139,7 @@
keystone_keystone_password: workshop
keystone_neutron_password: workshop
keystone_nova_password: workshop
+ keystone_designate_password: workshop
ceilometer_secret_key: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
index ddad293..7d0a986 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
@@ -16,6 +16,7 @@
- system.keystone.client.service.nova21
- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.stacklight_server_cluster
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
index 14bf4e0..894ea40 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
@@ -25,6 +25,9 @@
- system.cinder.volume.single
- system.cinder.volume.backend.lvm
- system.heat.server.cluster
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
- system.galera.server.cluster
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
@@ -33,7 +36,9 @@
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
+- system.galera.server.database.designate
- cluster.virtual-mcp-mitaka-ovs
+
parameters:
_param:
keepalived_vip_interface: ens4
@@ -104,3 +109,49 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
+ bind:
+ server:
+ control:
+ mgmt:
+ enabled: true
+ bind:
+ address: ${_param:single_address}
+ port: 953
+ allow:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ keys:
+ - designate
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node02_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node02_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node03_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node03_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ quota:
+ zones: ${_param:designate_quota_zones}
+ worker:
+ enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/init.yml
index 0ea85b3..eb936cd 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/init.yml
@@ -59,6 +59,36 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
+ designate_admin_api_enabled: true
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: bind9
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ designate_pool_target_options:
+ host: ${_param:openstack_control_node01_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node01_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ designate_version: ${_param:openstack_version}
+ designate_worker_enabled: false
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}
keystone_version: ${_param:openstack_version}
@@ -78,6 +108,7 @@
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
glusterfs_service_host: ${_param:cluster_vip_address}
+ designate_service_host: ${_param:cluster_vip_address}
metadata_password: workshop
mysql_admin_user: root
mysql_admin_password: workshop
@@ -90,6 +121,7 @@
mysql_neutron_password: workshop
mysql_nova_password: workshop
mysql_aodh_password: workshop
+ mysql_designate_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_ceilometer_password: workshop
@@ -99,6 +131,7 @@
keystone_keystone_password: workshop
keystone_neutron_password: workshop
keystone_nova_password: workshop
+ keystone_designate_password: workshop
ceilometer_secret_key: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
diff --git a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
index 8463c9e..aa4c25f 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
@@ -16,6 +16,7 @@
- system.keystone.client.service.nova21
- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.stacklightv2_server_cluster
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
index 6202b33..0f67d74 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
@@ -28,6 +28,9 @@
- system.ceilometer.server.backend.influxdb
- system.aodh.server.cluster
- system.heka.ceilometer_collector.single
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
- system.galera.server.cluster
- system.galera.server.database.aodh
- system.galera.server.database.ceilometer
@@ -37,6 +40,7 @@
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
+- system.galera.server.database.designate
- cluster.virtual-mcp-newton-dvr
parameters:
@@ -109,3 +113,49 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
+ bind:
+ server:
+ control:
+ mgmt:
+ enabled: true
+ bind:
+ address: ${_param:single_address}
+ port: 953
+ allow:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ keys:
+ - designate
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node02_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node02_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node03_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node03_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ quota:
+ zones: ${_param:designate_quota_zones}
+ worker:
+ enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/init.yml
index b6549a9..7ad4399 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/init.yml
@@ -64,6 +64,36 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
+ designate_admin_api_enabled: true
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: bind9
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ designate_pool_target_options:
+ host: ${_param:openstack_control_node01_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node01_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ designate_version: ${_param:openstack_version}
+ designate_worker_enabled: false
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}
keystone_version: ${_param:openstack_version}
@@ -85,6 +115,7 @@
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
glusterfs_service_host: ${_param:cluster_vip_address}
+ designate_service_host: ${_param:cluster_vip_address}
metadata_password: password
mysql_admin_user: root
mysql_admin_password: workshop
@@ -97,6 +128,7 @@
mysql_neutron_password: workshop
mysql_nova_password: workshop
mysql_aodh_password: workshop
+ mysql_designate_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_aodh_password: workshop
@@ -107,6 +139,7 @@
keystone_keystone_password: workshop
keystone_neutron_password: workshop
keystone_nova_password: workshop
+ keystone_designate_password: workshop
ceilometer_secret_key: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
diff --git a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
index 5a3ac24..da81d4e 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
@@ -16,6 +16,7 @@
- system.keystone.client.service.nova21
- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.stacklight_server_cluster
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
index fe542ac..edd6528 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
@@ -25,6 +25,9 @@
- system.cinder.volume.single
- system.cinder.volume.backend.lvm
- system.heat.server.cluster
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
- system.galera.server.cluster
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
@@ -33,7 +36,9 @@
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
+- system.galera.server.database.designate
- cluster.virtual-mcp-newton-ovs
+
parameters:
_param:
keepalived_vip_interface: ens4
@@ -104,3 +109,49 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
+ bind:
+ server:
+ control:
+ mgmt:
+ enabled: true
+ bind:
+ address: ${_param:single_address}
+ port: 953
+ allow:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ keys:
+ - designate
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node02_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node02_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node03_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node03_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ quota:
+ zones: ${_param:designate_quota_zones}
+ worker:
+ enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/init.yml
index cc16074..c1f5167 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/init.yml
@@ -59,6 +59,36 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
+ designate_admin_api_enabled: true
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: bind9
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ designate_pool_target_options:
+ host: ${_param:openstack_control_node01_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node01_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ designate_version: ${_param:openstack_version}
+ designate_worker_enabled: false
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}
keystone_version: ${_param:openstack_version}
@@ -78,6 +108,7 @@
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
glusterfs_service_host: ${_param:cluster_vip_address}
+ designate_service_host: ${_param:cluster_vip_address}
metadata_password: workshop
mysql_admin_user: root
mysql_admin_password: workshop
@@ -90,6 +121,7 @@
mysql_neutron_password: workshop
mysql_nova_password: workshop
mysql_aodh_password: workshop
+ mysql_designate_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_ceilometer_password: workshop
@@ -99,6 +131,7 @@
keystone_keystone_password: workshop
keystone_neutron_password: workshop
keystone_nova_password: workshop
+ keystone_designate_password: workshop
ceilometer_secret_key: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index d9e8984..8f26b0d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -249,5 +249,5 @@
type: ~
neutron_api:
type: ~
- nova_placement_api:
+ placement_api:
type: ~
diff --git a/classes/cluster/virtual-mcp-pike-dvr/.env b/classes/cluster/virtual-mcp-pike-dvr/.env
index 54bad51..13e6475 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf)
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml
new file mode 100644
index 0000000..79b8f6b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_common.yml
@@ -0,0 +1,40 @@
+classes:
+- system.backupninja.client.single
+- system.openssh.client.root
+parameters:
+ _param:
+ backupninja_backup_host: ${_param:openstack_control_node03_address}
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ # for salt-master backup
+ backupninja:
+ client:
+ target:
+ home_dir: /srv/volumes/backup/backupninja
+ engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_mysql.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_mysql.yml
new file mode 100644
index 0000000..9d0cace
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/client_mysql.yml
@@ -0,0 +1,37 @@
+classes:
+- system.xtrabackup.client.single
+parameters:
+ _param:
+ xtrabackup_remote_server: ${_param:openstack_control_node03_address}
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ xtrabackup:
+ server:
+ enabled: false
+ backup_dir: /srv/volumes/backup/xtrabackup
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml
new file mode 100644
index 0000000..8f84903
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/backup/server.yml
@@ -0,0 +1,15 @@
+classes:
+- system.backupninja.server.single
+- system.xtrabackup.server.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.backup
+parameters:
+ _param:
+ backupninja_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ backupninja:
+ server:
+ home_dir: /srv/volumes/backup/backupninja
+ xtrabackup:
+ server:
+ backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index 348f713..ebcf19b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -3,30 +3,27 @@
- system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.openssh.client.lab
+#- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
+- system.salt.master.formula.pkg.manila
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
- system.keystone.client.single
-- system.keystone.client.service.aodh
-- system.keystone.client.service.ceilometer
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
- system.keystone.client.service.designate
-- system.mysql.client.single
+- system.keystone.client.service.manila
+- system.keystone.client.service.manila2
- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-pike-dvr.openstack.proxy
-- cluster.virtual-mcp-pike-dvr.stacklight.proxy
+- cluster.virtual-mcp-pike-dvr.infra.backup.client_common
- cluster.virtual-mcp-pike-dvr
parameters:
_param:
@@ -49,19 +46,14 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- nginx:
- server:
- site:
- nginx_proxy_openstack_web:
- proxy:
- host: ${_param:openstack_proxy_address}
- nginx_proxy_openstack_api_heat_cfn:
- enabled: false
salt:
master:
+ backup: true
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
+ minion:
+ backup: true
reclass:
storage:
class_mapping:
@@ -121,21 +113,6 @@
cluster_param:
openstack_gateway_node01_address:
value_template: <<node_control_ip>>
- stacklight_monitor_node01:
- expression: <<node_hostname>>__equals__mon01
- cluster_param:
- stacklight_monitor_node01_address:
- value_template: <<node_control_ip>>
- stacklight_monitor_node02:
- expression: <<node_hostname>>__equals__mon02
- cluster_param:
- stacklight_monitor_node02_address:
- value_template: <<node_control_ip>>
- stacklight_monitor_node03:
- expression: <<node_hostname>>__equals__mon03
- cluster_param:
- stacklight_monitor_node03_address:
- value_template: <<node_control_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -145,9 +122,18 @@
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
+ openstack_share:
+ expression: <<node_hostname>>__startswith__share
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.share
+ node_param:
+ manila_share_address:
+ value_template: <<node_tenant_ip>>
node:
openstack_control_node01:
classes:
+ - cluster.virtual-mcp-pike-dvr.infra.backup.client_mysql
- service.galera.master.cluster
params:
mysql_cluster_role: master
@@ -160,14 +146,11 @@
linux_system_codename: xenial
openstack_control_node03:
classes:
+ - cluster.virtual-mcp-pike-dvr.infra.backup.server
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
openstack_compute_node01:
params:
single_address: 172.16.10.105
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/init.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/init.yml
index b01723d..0dcb951 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/init.yml
@@ -1,4 +1,9 @@
parameters:
+ _param:
+ cluster_domain: virtual-mcp-pike-dvr.local
+ cluster_name: virtual-mcp-pike-dvr
+ infra_config_hostname: cfg01
+ infra_config_address: 172.16.10.100
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/init.yml b/classes/cluster/virtual-mcp-pike-dvr/init.yml
index bb497ac..d551411 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/init.yml
@@ -1,56 +1,15 @@
classes:
- system.linux.network.dynamic_hosts
-- service.grafana.collector
-- system.fluentd
-- system.fluentd.label.default_metric
-- system.fluentd.label.default_metric.prometheus
-- system.fluentd.label.default_output.elasticsearch
-- system.fluentd.label.default_output.drop_event
- system.linux.system.repo.mcp.extra
- system.linux.system.single
-- system.linux.system.repo.mcp.apt_mirantis.fluentd
-- system.rsyslog.client.single
-- system.prometheus.collector
-- system.telegraf.agent
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
- cluster.virtual-mcp-pike-dvr.infra
- cluster.virtual-mcp-pike-dvr.openstack
-- cluster.virtual-mcp-pike-dvr.stacklight
- cluster.overrides
parameters:
- _param:
- cluster_domain: virtual-mcp-pike-dvr.local
- cluster_name: virtual-mcp-pike-dvr
- # infra service addresses
- infra_config_hostname: cfg01
- infra_config_address: 172.16.10.100
- # openstack service addresses
- openstack_database_address: 172.16.10.254
- openstack_proxy_address: 172.16.10.121
- openstack_proxy_node01_address: 172.16.10.121
- openstack_control_address: 172.16.10.254
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
- openstack_database_address: ${_param:openstack_control_address}
- openstack_database_node01_address: ${_param:openstack_control_node01_address}
- openstack_database_node02_address: ${_param:openstack_control_node02_address}
- openstack_database_node03_address: ${_param:openstack_control_node03_address}
- openstack_message_queue_address: ${_param:openstack_control_address}
- openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
- openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
- openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- openstack_gateway_address: 172.16.10.110
- openstack_gateway_node01_address: ${_param:openstack_gateway_address}
- openstack_dns_node01_address: 172.16.10.111
- openstack_dns_node02_address: 172.16.10.112
- # stacklight service addresses
- stacklight_monitor_address: 172.16.10.253
- stacklight_monitor_node01_address: 172.16.10.107
- stacklight_monitor_node02_address: 172.16.10.108
- stacklight_monitor_node03_address: 172.16.10.109
- stacklight_telemetry_address: ${_param:stacklight_monitor_address}
- stacklight_log_address: ${_param:stacklight_monitor_address}
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+ salt:
+ minion:
+ trusted_ca_minions:
+ - cfg01.${linux:system:domain}
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index a435fd9..d05fe6e 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -5,9 +5,7 @@
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
-- system.ceilometer.agent.cluster
- system.linux.network.interface.single_ovs_dvr
-- system.prometheus.exporters.libvirt
- cluster.virtual-mcp-pike-dvr
parameters:
_param:
@@ -16,11 +14,6 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
- neutron:
- compute:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -29,8 +22,3 @@
- host: ${_param:openstack_control_node01_address}
- host: ${_param:openstack_control_node02_address}
- host: ${_param:openstack_control_node03_address}
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- notify_on:
- state_change: vm_and_task_state
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 81c209a..e825437 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -7,6 +7,7 @@
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
+- system.apache.server.site.manila
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.client.cluster
@@ -14,28 +15,25 @@
- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.backup
- system.glusterfs.server.cluster
- system.glance.control.cluster
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
-- system.ceilometer.server.cluster
-- system.ceilometer.server.backend.influxdb
-- system.aodh.server.cluster
-- system.heka.ceilometer_collector.single
- system.designate.server.cluster
- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
-- system.galera.server.database.grafana
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.designate
+- system.galera.server.database.manila
- system.haproxy.proxy.listen.openstack.nova-placement
+- system.haproxy.proxy.listen.openstack.manila
+- system.manila.control.cluster
- cluster.virtual-mcp-pike-dvr
parameters:
@@ -62,9 +60,6 @@
keystone:
server:
admin_email: ${_param:admin_email}
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
designate:
pool_manager:
enabled: ${_param:designate_pool_manager_enabled}
@@ -100,19 +95,6 @@
engine: file
images: []
workers: 1
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- heat:
- server:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- neutron:
- server:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
nova:
controller:
networking: dvr
@@ -125,15 +107,3 @@
novncproxy_port: 6080
vncproxy_url: http://${_param:cluster_vip_address}:6080
workers: 1
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- cinder:
- volume:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- controller:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
index e5aac4e..e55f57b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
@@ -14,8 +14,3 @@
neutron_gateway_dvr: True
neutron_gateway_agent_mode: dvr_snat
linux_system_codename: xenial
- neutron:
- gateway:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index 4a7ef7e..a13ec7f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -1,5 +1,31 @@
parameters:
_param:
+ # openstack service addresses
+ openstack_database_address: 172.16.10.254
+ openstack_proxy_address: 172.16.10.121
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node03_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ openstack_gateway_address: 172.16.10.110
+ openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ openstack_dns_node01_address: 172.16.10.111
+ openstack_dns_node02_address: 172.16.10.112
+ openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
+
openstack_version: pike
apt_mk_version: nightly
cinder_version: ${_param:openstack_version}
@@ -30,11 +56,11 @@
cluster_vip_address: 172.16.10.254
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
+ cluster_node01_address: ${_param:openstack_control_node01_address}
cluster_node02_hostname: ctl02
- cluster_node02_address: 172.16.10.102
+ cluster_node02_address: ${_param:openstack_control_node02_address}
cluster_node03_hostname: ctl03
- cluster_node03_address: 172.16.10.103
+ cluster_node03_address: ${_param:openstack_control_node03_address}
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
@@ -99,14 +125,10 @@
heat_version: ${_param:openstack_version}
heat_service_host: ${_param:cluster_vip_address}
heat_domain_admin_password: workshop
- ceilometer_version: ${_param:openstack_version}
- ceilometer_service_host: ${_param:cluster_vip_address}
cinder_version: ${_param:openstack_version}
cinder_service_host: ${_param:cluster_vip_address}
- aodh_version: ${_param:openstack_version}
- aodh_service_host: ${_param:cluster_vip_address}
- ceilometer_graphite_publisher_host: 172.16.10.107
- ceilometer_graphite_publisher_port: 2013
+ manila_version: ${_param:openstack_version}
+ manila_service_host: ${_param:cluster_vip_address}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
@@ -118,19 +140,17 @@
mysql_admin_user: root
mysql_admin_password: workshop
mysql_cinder_password: workshop
- mysql_ceilometer_password: workshop
mysql_glance_password: workshop
mysql_grafana_password: workshop
mysql_heat_password: workshop
mysql_keystone_password: workshop
mysql_neutron_password: workshop
mysql_nova_password: workshop
- mysql_aodh_password: workshop
mysql_designate_password: workshop
+ mysql_manila_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
keystone_aodh_password: workshop
- keystone_ceilometer_password: workshop
keystone_cinder_password: workshop
keystone_glance_password: workshop
keystone_heat_password: workshop
@@ -138,19 +158,12 @@
keystone_neutron_password: workshop
keystone_nova_password: workshop
keystone_designate_password: workshop
- ceilometer_secret_key: workshop
+ keystone_manila_password: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
horizon_identity_encryption: none
horizon_identity_version: 2
- mongodb_server_replica_set: ceilometer
- mongodb_ceilometer_password: cloudlab
- mongodb_admin_password: cloudlab
- mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
- ceilometer_influxdb_password: lmapass
- openstack_log_appender: true
- openstack_fluentd_handler_enabled: true
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
new file mode 100644
index 0000000..57625ca
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
@@ -0,0 +1,12 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.storage.loopback_manila
+- system.manila.share
+- system.manila.share.backend.lvm
+- cluster.virtual-mcp-pike-ovs
+parameters:
+ _param:
+ manila_lvm_devices:
+ - /dev/loop0
+ loopback_device1_size: 20
diff --git a/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml
deleted file mode 100644
index 4988908..0000000
--- a/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-classes:
-- system.docker.client
-- system.elasticsearch.client.single
-- system.grafana.client
-- system.grafana.client.datasource.prometheus
-- system.kibana.client.single
-parameters:
- _param:
- # Elasticsearch/Kibana client parameters
- stacklight_log_address: ${_param:stacklight_monitor_address}
- # Grafana client parameters
- grafana_address: ${_param:stacklight_monitor_address}
- grafana_port: 15013
- grafana_user: admin
- grafana_password: ${_param:grafana_admin_password}
- grafana_prometheus_address: ${_param:stacklight_monitor_address}
- grafana_prometheus_port: 15016
-
- cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp-pike-dvr/stacklight/init.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/init.yml
deleted file mode 100644
index 015ea27..0000000
--- a/classes/cluster/virtual-mcp-pike-dvr/stacklight/init.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-parameters:
- _param:
- prometheus_control_address: ${_param:stacklight_monitor_address}
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
- elasticsearch_port: 9200
- stacklight_environment: ${_param:cluster_domain}
- stacklight_notification_topic: stacklight_notifications
- grafana_admin_password: admin
- grafana_database_type: mysql
- grafana_database_host: ${_param:openstack_database_address}
- grafana_database_password: ${_param:mysql_grafana_password}
- fluentd_elasticsearch_host: ${_param:stacklight_log_address}
- linux:
- network:
- host:
- mon:
- address: ${_param:stacklight_monitor_address}
- names:
- - mon
- - mon.${_param:cluster_domain}
- mon01:
- address: ${_param:stacklight_monitor_node01_address}
- names:
- - mon01
- - mon01.${_param:cluster_domain}
- mon02:
- address: ${_param:stacklight_monitor_node02_address}
- names:
- - mon02
- - mon02.${_param:cluster_domain}
- mon03:
- address: ${_param:stacklight_monitor_node03_address}
- names:
- - mon03
- - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-dvr/stacklight/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/proxy.yml
deleted file mode 100644
index 1bc78f3..0000000
--- a/classes/cluster/virtual-mcp-pike-dvr/stacklight/proxy.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-classes:
-- system.nginx.server.single
-- system.nginx.server.proxy.stacklight.grafana
-- system.nginx.server.proxy.stacklight.kibana
-- system.nginx.server.proxy.monitoring.prometheus_server
-- system.nginx.server.proxy.monitoring.prometheus_alertmanager
-- system.salt.minion.cert.proxy
-- cluster.virtual-mcp-pike-dvr
-parameters:
- _param:
- nginx_proxy_grafana_port: 15013
- nginx_proxy_ssl:
- enabled: true
- authority: ${_param:salt_minion_ca_authority}
- engine: salt
- mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml
deleted file mode 100644
index 1714106..0000000
--- a/classes/cluster/virtual-mcp-pike-dvr/stacklight/server.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-classes:
-- system.docker.host
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.mcp.apt_mirantis.docker
-- system.linux.system.repo.docker
-- system.heka.remote_collector.container
-- system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
-- system.heka.remote_collector.output.telegraf
-- system.elasticsearch.server.cluster
-- system.elasticsearch.server.curator
-- system.kibana.server.single
-- system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb_relay
-- service.haproxy.proxy.single
-- system.influxdb.relay.cluster
-- system.influxdb.server.single
-- system.influxdb.database.stacklight
-- system.influxdb.database.ceilometer
-- system.keepalived.cluster.instance.prometheus_server_vip
-- system.telegraf.agent.remote
-- system.prometheus.server.remote_write.docker
-- system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
-- system.docker.swarm.stack.monitoring.remote_collector
-- system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-pike-dvr
-parameters:
- _param:
- heka_amqp_host: ${_param:openstack_control_address}
- kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
- keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
- keepalived_prometheus_vip_password: 'password'
- keepalived_prometheus_vip_interface: ens4
- cluster_vip_address: ${_param:stacklight_monitor_address}
- cluster_local_address: ${_param:single_address}
- cluster_elasticsearch_port: 9200
- cluster_kibana_port: 5601
- cluster_node01_hostname: mon01
- cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_hostname: mon02
- cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_hostname: mon03
- cluster_node03_address: ${_param:stacklight_monitor_node03_address}
- docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
- docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
- docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
- docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
- docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
- docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
- docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
- docker_image_grafana: grafana/grafana:4.5.2
- influxdb_port: 8086
- influxdb_admin_password: password
- influxdb_stacklight_password: lmapass
- prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
- prometheus_influxdb_db: lma
- prometheus_influxdb_username: lma
- prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
- remote_collector_telegraf_host: monitoring_remote_agent
- linux:
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-pike-ovs/.env b/classes/cluster/virtual-mcp-pike-ovs/.env
index 54bad51..13e6475 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/.env
+++ b/classes/cluster/virtual-mcp-pike-ovs/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf)
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml
new file mode 100644
index 0000000..79b8f6b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_common.yml
@@ -0,0 +1,40 @@
+classes:
+- system.backupninja.client.single
+- system.openssh.client.root
+parameters:
+ _param:
+ backupninja_backup_host: ${_param:openstack_control_node03_address}
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ # for salt-master backup
+ backupninja:
+ client:
+ target:
+ home_dir: /srv/volumes/backup/backupninja
+ engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_mysql.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_mysql.yml
new file mode 100644
index 0000000..9d0cace
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/client_mysql.yml
@@ -0,0 +1,37 @@
+classes:
+- system.xtrabackup.client.single
+parameters:
+ _param:
+ xtrabackup_remote_server: ${_param:openstack_control_node03_address}
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ xtrabackup:
+ server:
+ enabled: false
+ backup_dir: /srv/volumes/backup/xtrabackup
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml
new file mode 100644
index 0000000..8f84903
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/backup/server.yml
@@ -0,0 +1,15 @@
+classes:
+- system.backupninja.server.single
+- system.xtrabackup.server.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.backup
+parameters:
+ _param:
+ backupninja_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ backupninja:
+ server:
+ home_dir: /srv/volumes/backup/backupninja
+ xtrabackup:
+ server:
+ backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index cce68af..f216aa9 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -3,29 +3,33 @@
- system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.openssh.client.lab
+#- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
+- system.salt.master.formula.pkg.manila
+- system.salt.master.formula.pkg.gnocchi
+- system.salt.master.formula.pkg.panko
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
- system.keystone.client.single
-- system.keystone.client.service.aodh
-- system.keystone.client.service.ceilometer
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
- system.keystone.client.service.glare
- system.keystone.client.service.cinder3
- system.keystone.client.service.designate
-- system.mysql.client.single
+- system.keystone.client.service.manila
+- system.keystone.client.service.manila2
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.panko
+- system.keystone.client.service.gnocchi
- system.reclass.storage.system.openstack_control_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-mcp-pike-ovs.openstack.proxy
-- cluster.virtual-mcp-pike-ovs.stacklight.proxy
+- system.reclass.storage.system.openstack_telemetry_cluster
+- cluster.virtual-mcp-pike-ovs.infra.backup.client_common
- cluster.virtual-mcp-pike-ovs
parameters:
_param:
@@ -48,19 +52,14 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- nginx:
- server:
- site:
- nginx_proxy_openstack_web:
- proxy:
- host: prx
- nginx_proxy_openstack_api_heat_cfn:
- enabled: false
salt:
master:
+ backup: true
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
+ minion:
+ backup: true
reclass:
storage:
class_mapping:
@@ -120,21 +119,6 @@
cluster_param:
openstack_gateway_node01_address:
value_template: <<node_control_ip>>
- stacklight_monitor_node01:
- expression: <<node_hostname>>__equals__mon01
- cluster_param:
- stacklight_monitor_node01_address:
- value_template: <<node_control_ip>>
- stacklight_monitor_node02:
- expression: <<node_hostname>>__equals__mon02
- cluster_param:
- stacklight_monitor_node02_address:
- value_template: <<node_control_ip>>
- stacklight_monitor_node03:
- expression: <<node_hostname>>__equals__mon03
- cluster_param:
- stacklight_monitor_node03_address:
- value_template: <<node_control_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -144,9 +128,33 @@
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
+ openstack_share:
+ expression: <<node_hostname>>__startswith__share
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.share
+ node_param:
+ manila_share_address:
+ value_template: <<node_tenant_ip>>
+ openstack_telemetry01:
+ expression: <<node_hostname>>__equals__mdb01
+ cluster_param:
+ openstack_telemetry_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry02:
+ expression: <<node_hostname>>__equals__mdb02
+ cluster_param:
+ openstack_telemetry_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry03:
+ expression: <<node_hostname>>__equals__mdb03
+ cluster_param:
+ openstack_telemetry_node03_address:
+ value_template: <<node_control_ip>>
node:
openstack_control_node01:
classes:
+ - cluster.virtual-mcp-pike-ovs.infra.backup.client_mysql
- service.galera.master.cluster
params:
mysql_cluster_role: master
@@ -159,14 +167,11 @@
linux_system_codename: xenial
openstack_control_node03:
classes:
+ - cluster.virtual-mcp-pike-ovs.infra.backup.server
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
openstack_compute_node01:
params:
single_address: 172.16.10.105
@@ -186,3 +191,15 @@
- cluster.virtual-mcp-pike-ovs.openstack.proxy
params:
linux_system_codename: xenial
+ openstack_telemetry_node01:
+ params:
+ # create resources only from 1 controller
+ # to prevent race conditions
+ ceilometer_create_gnocchi_resources: true
+ redis_cluster_role: 'master'
+ openstack_telemetry_node02:
+ params:
+ redis_cluster_role: 'slave'
+ openstack_telemetry_node03:
+ params:
+ redis_cluster_role: 'slave'
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml
index b01723d..4fcb494 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/init.yml
@@ -1,4 +1,9 @@
parameters:
+ _param:
+ cluster_domain: virtual-mcp-pike-ovs.local
+ cluster_name: virtual-mcp-pike-ovs
+ infra_config_hostname: cfg01
+ infra_config_address: 172.16.10.100
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/init.yml b/classes/cluster/virtual-mcp-pike-ovs/init.yml
index 98fc137..d08e08f 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -1,52 +1,15 @@
classes:
- system.linux.network.dynamic_hosts
-- service.grafana.collector
-- system.fluentd
-- system.fluentd.label.default_metric
-- system.fluentd.label.default_metric.prometheus
-- system.fluentd.label.default_output.elasticsearch
-- system.fluentd.label.default_output.drop_event
- system.linux.system.repo.mcp.extra
- system.linux.system.single
-- system.linux.system.repo.mcp.apt_mirantis.fluentd
-- system.rsyslog.client.single
-- system.prometheus.collector
-- system.telegraf.agent
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
- cluster.virtual-mcp-pike-ovs.infra
- cluster.virtual-mcp-pike-ovs.openstack
-- cluster.virtual-mcp-pike-ovs.stacklight
-
+- cluster.overrides
parameters:
- _param:
- cluster_domain: virtual-mcp-pike-ovs.local
- cluster_name: virtual-mcp-pike-ovs
- infra_config_hostname: cfg01
- # infra service addresses
- infra_config_address: 172.16.10.100
- # openstack service addresses
- openstack_proxy_address: 172.16.10.121
- openstack_proxy_node01_address: 172.16.10.121
- openstack_control_address: 172.16.10.254
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
- openstack_gateway_address: 172.16.10.110
- openstack_database_address: ${_param:openstack_control_address}
- openstack_message_queue_address: ${_param:openstack_control_address}
- openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
- openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
- openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
- # stacklight service addresses
- stacklight_monitor_address: 172.16.10.253
- stacklight_monitor_node01_address: 172.16.10.107
- stacklight_monitor_node02_address: 172.16.10.108
- stacklight_monitor_node03_address: 172.16.10.109
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
- stacklight_log_address: ${_param:stacklight_monitor_address}
- openstack_gateway_address: 172.16.10.110
- openstack_gateway_node01_address: ${_param:openstack_gateway_address}
- stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-
+ salt:
+ minion:
+ trusted_ca_minions:
+ - cfg01.${linux:system:domain}
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
index 97a0cfb..6613c2a 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
@@ -6,7 +6,7 @@
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.ceilometer.agent.cluster
-- system.prometheus.exporters.libvirt
+- system.ceilometer.agent.polling.default
- cluster.virtual-mcp-pike-ovs
parameters:
_param:
@@ -18,11 +18,6 @@
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- notify_on:
- state_change: vm_and_task_state
message_queue:
members:
- host: ${_param:openstack_control_node01_address}
@@ -40,12 +35,14 @@
mtu: ${_param:interface_mtu}
primary_interface:
enabled: true
+ ipflush_onchange: true
name: ${_param:primary_interface}
mtu: ${_param:interface_mtu}
proto: manual
type: eth
tenant_interface:
enabled: true
+ ipflush_onchange: true
name: ${_param:tenant_interface}
mtu: ${_param:interface_mtu}
proto: manual
@@ -65,4 +62,4 @@
address: ${_param:tenant_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:tenant_interface}
\ No newline at end of file
+ - ${_param:tenant_interface}
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 38c3c70..4618332 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -7,6 +7,7 @@
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
+- system.apache.server.site.manila
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.client.cluster
@@ -14,30 +15,33 @@
- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.backup
- system.glusterfs.server.cluster
- system.glance.control.cluster
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
-- system.ceilometer.server.cluster
-- system.ceilometer.server.backend.influxdb
-- system.aodh.server.cluster
-- system.heka.ceilometer_collector.single
- system.designate.server.cluster
- system.designate.server.backend.bind
- system.bind.server.single
- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
-- system.galera.server.database.grafana
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.designate
+- system.galera.server.database.manila
+- system.galera.server.database.aodh
+- system.galera.server.database.panko
+- system.galera.server.database.gnocchi
+- system.ceilometer.client
+- system.ceilometer.client.cinder_volume
+- system.ceilometer.client.neutron
- system.haproxy.proxy.listen.openstack.nova-placement
+- system.haproxy.proxy.listen.openstack.manila
+- system.manila.control.cluster
- cluster.virtual-mcp-pike-ovs
parameters:
_param:
@@ -77,9 +81,6 @@
keystone:
server:
admin_email: ${_param:admin_email}
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
designate:
server:
pools:
@@ -118,19 +119,6 @@
engine: file
images: []
workers: 1
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- heat:
- server:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- neutron:
- server:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
nova:
controller:
networking: dvr
@@ -143,15 +131,3 @@
novncproxy_port: 6080
vncproxy_url: http://${_param:cluster_vip_address}:6080
workers: 1
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- cinder:
- volume:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- controller:
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
index 3325580..6918620 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -1,5 +1,41 @@
parameters:
_param:
+ # openstack service addresses
+ openstack_database_address: 172.16.10.254
+ openstack_proxy_address: 172.16.10.121
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node03_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ openstack_gateway_address: 172.16.10.110
+ openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ openstack_dns_node01_address: 172.16.10.111
+ openstack_dns_node02_address: 172.16.10.112
+ openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
+ openstack_telemetry_address: 172.16.10.250
+ openstack_telemetry_node01_address: 172.16.10.45
+ openstack_telemetry_node02_address: 172.16.10.46
+ openstack_telemetry_node03_address: 172.16.10.47
+ openstack_telemetry_system_codename: xenial
+ openstack_telemetry_hostname: mdb
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_telemetry_keepalived_password: hf9GQOjG2uPhkJ2Q
+
openstack_version: pike
cinder_version: ${_param:openstack_version}
apt_mk_version: testing
@@ -7,6 +43,7 @@
admin_email: root@localhost
cluster_public_protocol: http
cluster_public_host: 172.16.10.254
+ telemetry_public_host: ${_param:openstack_telemetry_address}
neutron_public_protocol: http
neutron_control_dvr: False
neutron_tenant_network_types: "flat,vxlan"
@@ -29,11 +66,11 @@
cluster_vip_address: 172.16.10.254
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
+ cluster_node01_address: ${_param:openstack_control_node01_address}
cluster_node02_hostname: ctl02
- cluster_node02_address: 172.16.10.102
+ cluster_node02_address: ${_param:openstack_control_node02_address}
cluster_node03_hostname: ctl03
- cluster_node03_address: 172.16.10.103
+ cluster_node03_address: ${_param:openstack_control_node03_address}
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
@@ -70,19 +107,30 @@
designate_worker_enabled: true
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}
+ keystone_public_path: '/'
+ keystone_internal_path: '/'
+ keystone_admin_path: '/'
keystone_version: ${_param:openstack_version}
keystone_service_host: ${_param:cluster_vip_address}
heat_version: ${_param:openstack_version}
heat_service_host: ${_param:cluster_vip_address}
heat_domain_admin_password: workshop
- ceilometer_version: ${_param:openstack_version}
- ceilometer_service_host: ${_param:cluster_vip_address}
cinder_version: ${_param:openstack_version}
cinder_service_host: ${_param:cluster_vip_address}
+ manila_version: ${_param:openstack_version}
+ manila_service_host: ${_param:cluster_vip_address}
+ panko_version: ${_param:openstack_version}
+ panko_service_host: ${_param:openstack_telemetry_address}
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:openstack_telemetry_address}
aodh_version: ${_param:openstack_version}
- aodh_service_host: ${_param:cluster_vip_address}
- ceilometer_graphite_publisher_host: 172.16.10.107
- ceilometer_graphite_publisher_port: 2013
+ aodh_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_version: 4.0
+ gnocchi_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_public_host: ${_param:telemetry_public_host}
+ aodh_public_host: ${_param:telemetry_public_host}
+ ceilometer_public_host: ${_param:telemetry_public_host}
+ panko_public_host: ${_param:telemetry_public_host}
nova_version: ${_param:openstack_version}
nova_service_host: ${_param:cluster_vip_address}
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
@@ -94,19 +142,19 @@
mysql_admin_user: root
mysql_admin_password: workshop
mysql_cinder_password: workshop
- mysql_ceilometer_password: workshop
mysql_glance_password: workshop
- mysql_grafana_password: workshop
mysql_heat_password: workshop
mysql_keystone_password: workshop
mysql_neutron_password: workshop
mysql_nova_password: workshop
- mysql_aodh_password: workshop
mysql_designate_password: workshop
+ mysql_manila_password: workshop
+ mysql_ceilometer_password: workshop
+ mysql_panko_password: workshop
+ mysql_aodh_password: workshop
+ mysql_gnocchi_password: workshop
keystone_service_token: workshop
keystone_admin_password: workshop
- keystone_ceilometer_password: workshop
- keystone_aodh_password: workshop
keystone_cinder_password: workshop
keystone_glance_password: workshop
keystone_heat_password: workshop
@@ -114,19 +162,22 @@
keystone_neutron_password: workshop
keystone_nova_password: workshop
keystone_designate_password: workshop
- ceilometer_secret_key: workshop
+ keystone_manila_password: workshop
+ keystone_aodh_password: workshop
+ keystone_panko_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_gnocchi_password: workshop
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
horizon_identity_encryption: none
horizon_identity_version: 2
- mongodb_server_replica_set: ceilometer
- mongodb_ceilometer_password: cloudlab
- mongodb_admin_password: cloudlab
- mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
- ceilometer_influxdb_password: lmapass
openstack_log_appender: true
openstack_fluentd_handler_enabled: true
+ ceilometer_secret_key: workshop
+ ceilometer_agent_default_polling_interval: 15
+ ceilometer_agent_default_polling_meters:
+ - "*"
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
index f7ec9ce..2819d1e 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
@@ -12,4 +12,4 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
new file mode 100644
index 0000000..57625ca
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
@@ -0,0 +1,12 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.storage.loopback_manila
+- system.manila.share
+- system.manila.share.backend.lvm
+- cluster.virtual-mcp-pike-ovs
+parameters:
+ _param:
+ manila_lvm_devices:
+ - /dev/loop0
+ loopback_device1_size: 20
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
new file mode 100644
index 0000000..513ae52
--- /dev/null
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
@@ -0,0 +1,104 @@
+classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.openstack
+- system.memcached.server.single
+- system.apache.server.single
+- system.apache.server.site.gnocchi
+- system.apache.server.site.panko
+- system.glusterfs.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.gnocchi
+- system.glusterfs.server.volume.gnocchi
+- service.redis.server.single
+- system.gnocchi.server.cluster
+- system.gnocchi.common.storage.incoming.redis
+- system.gnocchi.common.storage.file
+- system.gnocchi.common.coordination.redis
+- system.ceilometer.server.cluster
+- system.ceilometer.server.coordination.redis
+- system.aodh.server.cluster
+- system.aodh.server.coordination.redis
+- system.panko.server.cluster
+- system.ceilometer.server.backend.default
+- cluster.virtual-mcp-pike-ovs
+parameters:
+ _param:
+ gnocchi_statsd_resource_id: 07f26121-5777-48ba-8a0b-d70468133dd9
+ keepalived_openstack_telemetry_vip_address: ${_param:openstack_telemetry_address}
+ keepalived_openstack_telemetry_vip_password: ${_param:openstack_telemetry_keepalived_password}
+ keepalived_openstack_telemetry_vip_interface: ens3
+ cluster_vip_address: ${_param:openstack_telemetry_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
+ cluster_node01_address: ${_param:openstack_telemetry_node01_address}
+ cluster_node02_hostname: ${_param:openstack_telemetry_node02_hostname}
+ cluster_node02_address: ${_param:openstack_telemetry_node02_address}
+ cluster_node03_hostname: ${_param:openstack_telemetry_node03_hostname}
+ cluster_node03_address: ${_param:openstack_telemetry_node03_address}
+ glusterfs_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_glusterfs_service_host: ${_param:glusterfs_service_host}
+ redis_sentinel_node01_address: ${_param:openstack_telemetry_node01_address}
+ redis_sentinel_node02_address: ${_param:openstack_telemetry_node02_address}
+ redis_sentinel_node03_address: ${_param:openstack_telemetry_node03_address}
+ openstack_telemetry_redis_url: redis://${_param:redis_sentinel_node01_address}:26379?sentinel=master_1&sentinel_fallback=${_param:redis_sentinel_node02_address}:26379&sentinel_fallback=${_param:redis_sentinel_node03_address}:26379
+ gnocchi_coordination_url: ${_param:openstack_telemetry_redis_url}
+ gnocchi_storage_incoming_redis_url: ${_param:openstack_telemetry_redis_url}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 160
+ redis:
+ server:
+ version: 3.0
+ bind:
+ address: ${_param:single_address}
+ cluster:
+ enabled: True
+ mode: sentinel
+ role: ${_param:redis_cluster_role}
+ quorum: 2
+ master:
+ host: ${_param:cluster_node01_address}
+ port: 6379
+ sentinel:
+ address: ${_param:single_address}
+ apache:
+ server:
+ modules:
+ - wsgi
+ gnocchi:
+ common:
+ database:
+ host: ${_param:openstack_database_address}
+ server:
+ pkgs:
+ # TODO: move python-memcache installation to formula
+ - gnocchi-api
+ - gnocchi-metricd
+ - python-memcache
+ aodh:
+ server:
+ coordination_backend:
+ url: ${_param:openstack_telemetry_redis_url}
+ identity:
+ host: ${_param:openstack_control_address}
+ ceilometer:
+ server:
+ coordination_backend:
+ url: ${_param:openstack_telemetry_redis_url}
+ identity:
+ host: ${_param:openstack_control_address}
diff --git a/classes/cluster/virtual-mcp-pike-ovs/stacklight/client.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/client.yml
deleted file mode 100644
index 62634a9..0000000
--- a/classes/cluster/virtual-mcp-pike-ovs/stacklight/client.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-classes:
-- system.docker.client
-- system.elasticsearch.client.single
-- system.grafana.client
-- system.grafana.client.datasource.prometheus
-- system.kibana.client.single
-- cluster.virtual-mcp-pike-ovs
-parameters:
- _param:
- # Elasticsearch/Kibana client parameters
- stacklight_log_address: ${_param:stacklight_monitor_address}
- # Grafana client parameters
- grafana_address: ${_param:stacklight_monitor_address}
- grafana_port: 15013
- grafana_user: admin
- grafana_password: ${_param:grafana_admin_password}
- grafana_prometheus_address: ${_param:stacklight_monitor_address}
- grafana_prometheus_port: 15016
-
- cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp-pike-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/init.yml
deleted file mode 100644
index f89e303..0000000
--- a/classes/cluster/virtual-mcp-pike-ovs/stacklight/init.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-parameters:
- _param:
- linux_system_codename: xenial
- prometheus_control_address: ${_param:stacklight_monitor_address}
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
- elasticsearch_port: 9200
- stacklight_environment: ${_param:cluster_domain}
- stacklight_notification_topic: stacklight_notifications
- grafana_admin_password: admin
- grafana_database_type: mysql
- grafana_database_host: ${_param:openstack_database_address}
- grafana_database_password: ${_param:mysql_grafana_password}
- fluentd_elasticsearch_host: ${_param:stacklight_log_address}
- linux:
- network:
- host:
- mon:
- address: ${_param:stacklight_monitor_address}
- names:
- - mon
- - mon.${_param:cluster_domain}
- mon01:
- address: ${_param:stacklight_monitor_node01_address}
- names:
- - mon01
- - mon01.${_param:cluster_domain}
- mon02:
- address: ${_param:stacklight_monitor_node02_address}
- names:
- - mon02
- - mon02.${_param:cluster_domain}
- mon03:
- address: ${_param:stacklight_monitor_node03_address}
- names:
- - mon03
- - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-ovs/stacklight/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/proxy.yml
deleted file mode 100644
index 1e72fd9..0000000
--- a/classes/cluster/virtual-mcp-pike-ovs/stacklight/proxy.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-classes:
-- system.nginx.server.single
-- system.nginx.server.proxy.stacklight.grafana
-- system.nginx.server.proxy.stacklight.kibana
-- system.nginx.server.proxy.monitoring.prometheus_server
-- system.nginx.server.proxy.monitoring.prometheus_alertmanager
-- system.salt.minion.cert.proxy
-- cluster.virtual-mcp-pike-ovs
-parameters:
- _param:
- nginx_proxy_grafana_port: 15013
- nginx_proxy_ssl:
- enabled: true
- authority: ${_param:salt_minion_ca_authority}
- engine: salt
- mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml
deleted file mode 100644
index f1631aa..0000000
--- a/classes/cluster/virtual-mcp-pike-ovs/stacklight/server.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-classes:
-- system.docker.host
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.mcp.apt_mirantis.docker
-- system.heka.remote_collector.container
-- system.heka.remote_collector.input.amqp
-- system.heka.remote_collector.output.elasticsearch
-- system.heka.remote_collector.output.telegraf
-- system.elasticsearch.server.cluster
-- system.elasticsearch.server.curator
-- system.kibana.server.single
-- system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.influxdb_relay
-- service.haproxy.proxy.single
-- system.influxdb.relay.cluster
-- system.influxdb.server.single
-- system.influxdb.database.stacklight
-- system.influxdb.database.ceilometer
-- system.keepalived.cluster.instance.prometheus_server_vip
-- system.telegraf.agent.remote
-- system.prometheus.server.remote_write.docker
-- system.prometheus.server.alertmanager.dns
-- system.prometheus.server.target.dns
-- system.docker.swarm.stack.monitoring.prometheus_global
-- system.docker.swarm.stack.monitoring.remote_collector
-- system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp-pike-ovs
-parameters:
- _param:
- heka_amqp_host: ${_param:openstack_control_address}
- kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
- keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
- keepalived_prometheus_vip_password: 'password'
- keepalived_prometheus_vip_interface: ens4
- cluster_vip_address: ${_param:stacklight_monitor_address}
- cluster_local_address: ${_param:single_address}
- cluster_elasticsearch_port: 9200
- cluster_kibana_port: 5601
- cluster_node01_hostname: mon01
- cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_hostname: mon02
- cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_hostname: mon03
- cluster_node03_address: ${_param:stacklight_monitor_node03_address}
- docker_image_alertmanager: docker-prod-local.artifactory.mirantis.com/openstack-docker/alertmanager:${_param:apt_mk_version}
- docker_image_pushgateway: docker-prod-local.artifactory.mirantis.com/openstack-docker/pushgateway:${_param:apt_mk_version}
- docker_image_prometheus: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus:${_param:apt_mk_version}
- docker_image_remote_agent: docker-prod-local.artifactory.mirantis.com/openstack-docker/telegraf:${_param:apt_mk_version}
- docker_image_remote_storage_adapter: docker-prod-local.artifactory.mirantis.com/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
- docker_image_remote_collector: docker-prod-local.artifactory.mirantis.com/openstack-docker/heka:${_param:apt_mk_version}
- docker_image_prometheus_relay: docker-prod-local.artifactory.mirantis.com/openstack-docker/prometheus_relay:${_param:apt_mk_version}
- docker_image_grafana: docker-prod-local.artifactory.mirantis.com/mirantis/external/grafana:${_param:apt_mk_version}
- influxdb_port: 8086
- influxdb_admin_password: password
- influxdb_stacklight_password: lmapass
- prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
- prometheus_influxdb_db: lma
- prometheus_influxdb_username: lma
- prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
- remote_collector_telegraf_host: monitoring_remote_agent
- linux:
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_common.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_common.yml
new file mode 100644
index 0000000..79b8f6b
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_common.yml
@@ -0,0 +1,40 @@
+classes:
+- system.backupninja.client.single
+- system.openssh.client.root
+parameters:
+ _param:
+ backupninja_backup_host: ${_param:openstack_control_node03_address}
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ # for salt-master backup
+ backupninja:
+ client:
+ target:
+ home_dir: /srv/volumes/backup/backupninja
+ engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_mysql.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_mysql.yml
new file mode 100644
index 0000000..18cabd8
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/client_mysql.yml
@@ -0,0 +1,38 @@
+classes:
+- system.xtrabackup.client.single
+parameters:
+ _param:
+ xtrabackup_remote_server: ${_param:openstack_control_node03_address}
+ xtrabackup_qpress_source_name: http://${_param:aptly_server_address}:8078/qpress-11-linux-x64.tar
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ xtrabackup:
+ server:
+ enabled: false
+ backup_dir: /srv/volumes/backup/xtrabackup
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/server.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/server.yml
new file mode 100644
index 0000000..8f84903
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/backup/server.yml
@@ -0,0 +1,15 @@
+classes:
+- system.backupninja.server.single
+- system.xtrabackup.server.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.backup
+parameters:
+ _param:
+ backupninja_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ backupninja:
+ server:
+ home_dir: /srv/volumes/backup/backupninja
+ xtrabackup:
+ server:
+ backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index f72467c..4224974 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -3,7 +3,7 @@
- system.linux.system.single
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.openssh.client.lab
+#- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
- system.reclass.storage.salt
@@ -24,6 +24,7 @@
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.stacklightv2_server_cluster
+- cluster.virtual-offline-pike-ovs-dpdk.infra.backup.client_common
- cluster.virtual-offline-pike-ovs-dpdk.openstack.proxy
- cluster.virtual-offline-pike-ovs-dpdk.stacklight.proxy
- cluster.virtual-offline-pike-ovs-dpdk
@@ -58,9 +59,12 @@
enabled: false
salt:
master:
+ backup: true
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
+ minion:
+ backup: true
reclass:
storage:
class_mapping:
@@ -147,6 +151,7 @@
node:
openstack_control_node01:
classes:
+ - cluster.virtual-offline-pike-ovs-dpdk.infra.backup.client_mysql
- service.galera.master.cluster
params:
mysql_cluster_role: master
@@ -159,6 +164,7 @@
linux_system_codename: xenial
openstack_control_node03:
classes:
+ - cluster.virtual-offline-pike-ovs-dpdk.infra.backup.server
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index 75a6a48..1f8adb0 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -15,6 +15,7 @@
- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.volume.backup
- system.glusterfs.server.cluster
- system.glance.control.cluster
- system.nova.control.cluster
diff --git a/classes/system b/classes/system
index d955008..3799d9a 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit d9550082248816acf8be8937a11f968cd9da4618
+Subproject commit 3799d9a181bcb6d5d07612a5934dbfc9ed18960e