Merge "Make OvS max_idle & queues configuration optional" into stable/gambia

[yardstick.git] / setup.py

diff --git a/setup.py b/setup.py
index 315ab67..881ef92 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,11 @@
+##############################################################################
+# Copyright (c) 2017 Ericsson AB and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 from __future__ import absolute_import
 from setuptools import setup, find_packages
 
@@ -21,6 +29,8 @@ setup(
             'benchmark/scenarios/networking/*.txt',
             'benchmark/scenarios/parser/*.sh',
             'benchmark/scenarios/storage/*.bash',
+            'network_services/nfvi/collectd.conf',
+            'network_services/nfvi/collectd.sh',
             'resources/files/*',
             'resources/scripts/install/*.bash',
             'resources/scripts/remove/*.bash'
@@ -43,6 +53,7 @@ setup(
             'yardstick=yardstick.main:main',
             'yardstick-plot=yardstick.plot.plotter:main [plot]'
         ],
+        'yardstick.scenario': []
     },
     scripts=[
         'tools/yardstick-img-modify',