X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=setup.py;h=303a65201f795d6e461aa2d35e31b4e5b79629a4;hb=97a50f61a99f4e96c3a2f537303853d956c1ff5e;hp=68781be1a60b6af24adf7e3c1df6cd28d5e650d0;hpb=2c290ca4088492a3c32bb6ab218d0004da68f6ea;p=osm%2FRO.git

diff --git a/setup.py b/setup.py
index 68781be1..303a6520 100755
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
+#from distutils.core import setup
+#from distutils.command.install_data import install_data
 from setuptools import setup
-from setuptools.command.install import install
 from os import system
 #import glob
 
 _name = 'osm_ro'
-_version = '1.0.0'
+_version = open('RO_VERSION').read().strip()
 _description = 'OSM Resource Orchestrator'
 _author = 'ETSI OSM'
 _author_email = 'alfonso.tiernosepulveda@telefonica.com'
@@ -23,6 +24,7 @@ _requirements = [
     "argcomplete",
     "requests",
     "logutils",
+    "python-openstackclient",
     "python-novaclient",
     "python-keystoneclient",
     "python-glanceclient",
@@ -35,12 +37,6 @@ _requirements = [
     "boto",
 ]
 
-class ROInstaller(install):
-    def run(self):
-        cmd = 'echo "Running install script"'
-        system(cmd)
-        install.run(self)
-
 setup(name=_name,
       version = _version,
       description = _description,
@@ -57,13 +53,12 @@ setup(name=_name,
       package_data = {_name: ['vnfs/*.yaml', 'vnfs/examples/*.yaml',
                          'scenarios/*.yaml', 'scenarios/examples/*.yaml',
                          'instance-scenarios/examples/*.yaml', 'database_utils/*',
-                         'scripts/install-openmano*.sh']},
-      data_files = [('/etc/osm/', ['openmanod.cfg']),
-                   ('/etc/systemd/system/', ['osm-ro.service']),
+                         'scripts/*']},
+      data_files = [('/etc/osm/', ['osm_ro/openmanod.cfg']),
+                   ('/etc/systemd/system/', ['osm_ro/osm-ro.service']),
                    ],
-      scripts=['openmanod.py', 'openmano', 'osm_ro/scripts/service-openmano.sh', 'osm_ro/scripts/openmano-report.sh',],
+      scripts=['openmanod', 'openmano', 'osm_ro/scripts/service-openmano', 'osm_ro/scripts/openmano-report',],
       install_requires=_requirements,
       include_package_data=True,
-      cmdclass = {'install': ROInstaller},
       )