From 0ea941a615c038c2cda55a2ba5df1ac7183c7f0c Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Tue, 31 Jan 2017 15:04:13 -0500
Subject: Add VPP composable service

Vector Packet Processing (VPP) is a high performance packet processing
stack that runs in user space in Linux. VPP is used as an alternative to
kernel networking stack for accelerated network data path. This patch
adds VPP as a composable service. Note that NIC binding related configs
for VPP are handled in os-net-config.

Depends-on: I70a68a204a8b9d533fc2fa4fc33c39c3b1c366bf

Change-Id: I5e4b1903dc87cb16259eeb05db585678acadbc6b
Implements: blueprint fdio-integration-tripleo
---
 environments/services/vpp.yaml               |  9 ++++++
 overcloud-resource-registry-puppet.j2.yaml   |  1 +
 puppet/services/vpp.yaml                     | 47 ++++++++++++++++++++++++++++
 releasenotes/notes/vpp-84d35e51ff62a58c.yaml |  6 ++++
 roles_data.yaml                              |  3 ++
 5 files changed, 66 insertions(+)
 create mode 100644 environments/services/vpp.yaml
 create mode 100644 puppet/services/vpp.yaml
 create mode 100644 releasenotes/notes/vpp-84d35e51ff62a58c.yaml

diff --git a/environments/services/vpp.yaml b/environments/services/vpp.yaml
new file mode 100644
index 00000000..9bad70f8
--- /dev/null
+++ b/environments/services/vpp.yaml
@@ -0,0 +1,9 @@
+resource_registry:
+  OS::TripleO::Services::Vpp: ../../puppet/services/vpp.yaml
+
+#parameter_defaults:
+  #VPP main thread core pinning
+  #VppCpuMainCore: '1'
+
+  #List of cores for VPP worker thread pinning
+  #VppCpuCorelistWorkers: ['3','4']
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 1360d0be..b811a5a3 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -248,6 +248,7 @@ resource_registry:
   OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None
   OS::TripleO::Services::OctaviaWorker: OS::Heat::None
   OS::TripleO::Services::MySQLClient: puppet/services/database/mysql-client.yaml
+  OS::TripleO::Services::Vpp: OS::Heat::None
 
 parameter_defaults:
   EnablePackageInstall: false
diff --git a/puppet/services/vpp.yaml b/puppet/services/vpp.yaml
new file mode 100644
index 00000000..59866d39
--- /dev/null
+++ b/puppet/services/vpp.yaml
@@ -0,0 +1,47 @@
+heat_template_version: ocata
+
+description: >
+  Vpp service configured with Puppet
+
+parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  VppCpuMainCore:
+    default: ''
+    description: VPP main thread core pinning.
+    type: string
+  VppCpuCorelistWorkers:
+    default: ''
+    description: List of cores for VPP worker thread pinning
+    type: string
+  MonitoringSubscriptionVpp:
+    default: 'overcloud-vpp'
+    type: string
+
+outputs:
+  role_data:
+    description: Role data for the Vpp role.
+    value:
+      service_name: vpp
+      monitoring_subscription: {get_param: MonitoringSubscriptionVpp}
+      config_settings:
+        fdio::vpp_cpu_main_core: {get_param: VppCpuMainCore}
+        fdio::vpp_cpu_corelist_workers: {get_param: VppCpuCorelistWorkers}
+      step_config: |
+        include ::tripleo::profile::base::vpp
+      upgrade_tasks:
+        - name: Stop vpp service
+          tags: step2
+          service: name=vpp state=stopped
diff --git a/releasenotes/notes/vpp-84d35e51ff62a58c.yaml b/releasenotes/notes/vpp-84d35e51ff62a58c.yaml
new file mode 100644
index 00000000..b78df17d
--- /dev/null
+++ b/releasenotes/notes/vpp-84d35e51ff62a58c.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - Add the ability to deploy VPP. Vector Packet Processing (VPP) is a high
+    performance packet processing stack that runs in user space in Linux.
+    VPP is used as an alternative to kernel networking stack for
+    accelerated network data path.
diff --git a/roles_data.yaml b/roles_data.yaml
index 9e3b0a18..64b72a4e 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -125,6 +125,7 @@
     - OS::TripleO::Services::OctaviaHealthManager
     - OS::TripleO::Services::OctaviaHousekeeping
     - OS::TripleO::Services::OctaviaWorker
+    - OS::TripleO::Services::Vpp
 
 - name: Compute
   CountDefault: 1
@@ -154,6 +155,8 @@
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::Collectd
+    - OS::TripleO::Services::Vpp
+
 
 - name: BlockStorage
   ServicesDefault:
-- 
cgit 1.2.3-korg