Merge "Integrate telemetry in virtual-mcp-pike-dvr-ssl"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
index f406a42..83cd6b8 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
index cbffebb..a339f4b 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
index 39f1b33..b3b3c76 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
index 0467708..3fb6af4 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.openstack
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index b56b9ac..0b8aa98 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
index 412a79c..c42e143 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.openstack
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 38c8e43..f42138b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index 6f3cc55..ce5ab70 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
#- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
index f5c8597..006d477 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.openstack
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index 0563d54..0cb7cf0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
#- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 4618332..2da65a7 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -46,6 +46,13 @@
parameters:
_param:
keepalived_vip_interface: ens4
+ galera:
+ master:
+ innodb_buffer_pool_size: 1024M
+ max_connections: 1000
+ slave:
+ innodb_buffer_pool_size: 1024M
+ max_connections: 1000
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index 0551bab..e19165e 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -1,5 +1,6 @@
classes:
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 234544f..6594f9c 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -1,5 +1,6 @@
classes:
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.ubuntu
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index 0211bf4..2f03c3c 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
index 3cf494d..516e5db 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index be7adff..6f4fbed 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 16e21f2..d39e9d6 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
- system.openssh.client.lab
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 cd33c53..43b9bb9 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
#- system.openssh.client.lab
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
index 808d64f..0dade38 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -51,4 +51,52 @@
openstack_gateway_address: 172.16.10.110
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-
+ remote_rsyslog_host: 127.0.0.3
+ remote_rsyslog_port: 10514
+ rsyslog:
+ client:
+ run_user: syslog
+ run_group: adm
+ enabled: true
+ rainerscript:
+ module:
+ imfile: {}
+ input:
+ imfile:
+ nginx:
+ File: "/var/log/nginx/*.log"
+ Tag: "nginx__"
+ Severity: "notice"
+ Facility: "local0"
+ PersistStateInterval: "0"
+ Ruleset: "myapp_logs"
+ apache2:
+ File: "/var/log/apache2/*.log"
+ Tag: "apache2__"
+ Severity: "notice"
+ Facility: "local0"
+ Ruleset: "myapp_logs"
+ PersistStateInterval: "0"
+ rabbitmq:
+ File: "/var/log/rabbitmq/*.log"
+ Tag: "rabbitmq__"
+ Severity: "notice"
+ Facility: "local0"
+ PersistStateInterval: "0"
+ Ruleset: "myapp_logs"
+ template:
+ ImfileFilePath:
+ parameter:
+ type: string
+ string: "<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag:1:32%%$.suffix%%msg:::sp-if-no-1st-sp%%msg%\n"
+ ruleset:
+ remote_logs:
+ description: 'action(type="omfwd" Target="${_param:remote_rsyslog_host}" Port="${_param:remote_rsyslog_port}" Protocol="udp" Template="ImfileFilePath")'
+ myapp_logs:
+ description: 'set $.suffix=re_extract($!metadata!filename, "(.*)/([^/]*[^/.log])", 0, 2, "all.log"); call remote_logs'
+ output:
+ remote:
+ somehost.domain:
+ action: "@${_param:remote_rsyslog_host}:${_param:remote_rsyslog_port}"
+ filter: "*.*"
+ enabled: true
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
index 9f1aba9..2f132ed 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
@@ -126,6 +126,8 @@
mongodb_admin_password: cloudlab
mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
ceilometer_influxdb_password: lmapass
+ openstack_log_appender: true
+ openstack_ossyslog_handler_enabled: true
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index eb0da09..eae43fa 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo_local.mcp.salt
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
index 25baf27..f895a17 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab