X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-libvirt.yaml;h=a9b2b3f9098d25db165156a4a01aec586c5a64c2;hb=15c358de1c8a2d338953a712573c85fb451f05f3;hp=1ebec9746fd76a394a6c51af44ea897c6eac8a99;hpb=b61f1a33d55a23df7cd451679ee356d12c7f4a24;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml
index 1ebec974..a9b2b3f9 100644
--- a/puppet/services/nova-libvirt.yaml
+++ b/puppet/services/nova-libvirt.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   Libvirt service configured with Puppet
@@ -21,6 +21,17 @@ parameters:
   NovaComputeLibvirtType:
     type: string
     default: kvm
+  LibvirtEnabledPerfEvents:
+    type: comma_delimited_list
+    default: []
+    description: This is a performance event list which could be used as monitor.
+                 For example - ``enabled_perf_events = cmt, mbml, mbmt``
+                 The supported events list can be found in
+                 https://libvirt.org/html/libvirt-libvirt-domain.html ,
+                 which you may need to search key words ``VIR_PERF_PARAM_*``
+  MonitoringSubscriptionNovaLibvirt:
+    default: 'overcloud-nova-libvirt'
+    type: string
 
 resources:
   NovaBase:
@@ -35,6 +46,7 @@ outputs:
     description: Role data for the Libvirt service.
     value:
       service_name: nova_libvirt
+      monitoring_subscription: {get_param: MonitoringSubscriptionNovaLibvirt}
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
@@ -46,6 +58,17 @@ outputs:
             tripleo::profile::base::nova::libvirt_enabled: true
             nova::compute::libvirt::services::libvirt_virt_type: {get_param: NovaComputeLibvirtType}
             nova::compute::libvirt::libvirt_virt_type: {get_param: NovaComputeLibvirtType}
+            nova::compute::libvirt::libvirt_enabled_perf_events: {get_param: LibvirtEnabledPerfEvents}
+            nova::compute::libvirt::qemu::configure_qemu: true
+            nova::compute::libvirt::qemu::max_files: 32768
+            nova::compute::libvirt::qemu::max_processes: 131072
+            tripleo.nova_libvirt.firewall_rules:
+              '200 nova_libvirt':
+                dport:
+                  - 16509
+                  - 16514
+                  - '49152-49215'
+                  - '5900-5999'
 
       step_config: |
         include tripleo::profile::base::nova::libvirt