diff --git a/ceilometer/server/backend/gnocchi.yml b/ceilometer/server/backend/gnocchi.yml
new file mode 100644
index 0000000..9eca73b
--- /dev/null
+++ b/ceilometer/server/backend/gnocchi.yml
@@ -0,0 +1,19 @@
+classes:
+- service.ceilometer.server.publisher.panko
+parameters:
+  _param:
+    openstack_event_alarm_topic: alarm.all
+    ceilometer_create_gnocchi_resources: false
+    ceilometer_gnocchi_filter_project: service
+  # gnocchi and panko are default backends for Ceilometer since Pike
+  # they are incompatible with any legacy database publisher backends
+  ceilometer:
+    server:
+      publisher:
+        gnocchi:
+          enabled: true
+          url: "gnocchi://?filter_project=${_param:ceilometer_gnocchi_filter_project}"
+          publish_metric: true
+          # filter_project is deprecated since queens
+          filter_project: ${_param:ceilometer_gnocchi_filter_project}
+          create_resources: ${_param:ceilometer_create_gnocchi_resources}
diff --git a/gnocchi/client/init.yml b/gnocchi/client/init.yml
new file mode 100644
index 0000000..2fcea87
--- /dev/null
+++ b/gnocchi/client/init.yml
@@ -0,0 +1,2 @@
+classes:
+- service.gnocchi.client
diff --git a/gnocchi/client/v1/archive_policy/default.yml b/gnocchi/client/v1/archive_policy/default.yml
new file mode 100644
index 0000000..82de812
--- /dev/null
+++ b/gnocchi/client/v1/archive_policy/default.yml
@@ -0,0 +1,27 @@
+parameters:
+  _param:
+    gnocchi_default_policy_granularity_1: '0:01:00'
+    gnocchi_default_policy_points_1: 10080
+    gnocchi_default_policy_timespan_1: '7 days'
+    gnocchi_default_policy_granularity_2: '1:00:00'
+    gnocchi_default_policy_points_2: 8760
+    gnocchi_default_policy_timespan_2: '365 days'
+    gnocchi_default_policy_rule_metric_pattern: '"*"'
+  gnocchi:
+    client:
+      resources:
+        v1:
+          enabled: true
+          cloud_name: 'admin_identity'
+          archive_policies:
+            default:
+              definition:
+                - granularity: "${_param:gnocchi_default_policy_granularity_1}"
+                  points: "${_param:gnocchi_default_policy_points_1}"
+                  timespan: "${_param:gnocchi_default_policy_timespan_1}"
+                - granularity: "${_param:gnocchi_default_policy_granularity_2}"
+                  points: "${_param:gnocchi_default_policy_points_2}"
+                  timespan: "${_param:gnocchi_default_policy_timespan_2}"
+              rules:
+                default:
+                  metric_pattern: "${_param:gnocchi_default_policy_rule_metric_pattern}"
diff --git a/haproxy/proxy/listen/opencontrail/analytics.yml b/haproxy/proxy/listen/opencontrail/analytics.yml
index fd20277..14890ca 100644
--- a/haproxy/proxy/listen/opencontrail/analytics.yml
+++ b/haproxy/proxy/listen/opencontrail/analytics.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    opencontrail_stats_password: password
   haproxy:
     proxy:
       listen:
diff --git a/haproxy/proxy/listen/opencontrail/control.yml b/haproxy/proxy/listen/opencontrail/control.yml
index c389682..490d100 100644
--- a/haproxy/proxy/listen/opencontrail/control.yml
+++ b/haproxy/proxy/listen/opencontrail/control.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    opencontrail_stats_password: password
   haproxy:
     proxy:
       listen:
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 6e4b65f..af33cc1 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -708,7 +708,7 @@
             trigger:
               gerrit:
                 project:
-                  "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|aodh|ceilometer|gnocchi|panko|manila|salt|linux|reclass|galera|memcached|rabbitmq|bind|apache|runtest|oslo-templates)$":
+                  "^salt-formulas/(nova|cinder|glance|keystone|horizon|neutron|designate|heat|ironic|barbican|aodh|ceilometer|gnocchi|panko|manila|salt|linux|reclass|galera|memcached|rabbitmq|bind|apache|runtest|oslo-templates|auditd)$":
                     compare_type: 'REG_EXP'
                     branches:
                       - master
diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index ac6325d..27e8482 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -14,6 +14,7 @@
     kubernetes_genie_repo: mirantis
     kubernetes_flannel_repo: quay.io/coreos
     kubernetes_metallb_repo: metallb
+    kubernetes_sriov_repo: https://artifactory.mcp.mirantis.net/artifactory/binary-prod-local/mirantis/kubernetes/sriov-cni
 
     # component docker images
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -38,6 +39,8 @@
     kubernetes_flannel_image: ${_param:kubernetes_flannel_repo}/flannel:v0.10.0-amd64
     kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.6.2
     kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.6.2
+    kubernetes_sriov_source: ${_param:kubernetes_sriov_repo}/sriov_v0.3-8-g8b7ed98
+    kubernetes_sriov_source_hash: md5=c0cc33202afd02e4cc44b977a8faf6e7
 
     kubelet_fail_on_swap: true
     kubernetes_kubedns_enabled: true
@@ -51,6 +54,7 @@
     kubernetes_opencontrail_enabled: false
     kubernetes_contrail_network_controller_enabled: false
     kubernetes_metallb_enabled: false
+    kubernetes_sriov_enabled: false
 
   docker:
     host:
@@ -111,6 +115,10 @@
         opencontrail:
           enabled: ${_param:kubernetes_opencontrail_enabled}
           cni_image: ${_param:kubernetes_contrail_cni_image}
+        sriov:
+          enabled: ${_param:kubernetes_sriov_enabled}
+          source: ${_param:kubernetes_sriov_source}
+          source_hash: ${_param:kubernetes_sriov_source_hash}
     pool:
       kubelet:
         fail_on_swap: ${_param:kubelet_fail_on_swap}
@@ -127,3 +135,7 @@
         opencontrail:
           enabled: ${_param:kubernetes_opencontrail_enabled}
           cni_image: ${_param:kubernetes_contrail_cni_image}
+        sriov:
+          enabled: ${_param:kubernetes_sriov_enabled}
+          source: ${_param:kubernetes_sriov_source}
+          source_hash: ${_param:kubernetes_sriov_source_hash}
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 6174379..e660e13 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -11,7 +11,7 @@
     opencontrail_message_queue_node01_address: ${_param:openstack_message_queue_node01_address}
     opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
     opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
-    opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller::${_param:opencontrail_image_tag}
+    opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller:${_param:opencontrail_image_tag}
     opencontrail_controller_container_name: opencontrail_controller_1
     analytics_vip_address: ${_param:opencontrail_analytics_address}
   opencontrail: