Merge pull request #44 from ARGOeu/devel

Version 1.0.4-1

poem.spec

@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           poem
-Version:        1.0.3
+Version:        1.0.4
 Release:        1%{?dist}
 Summary:        Profile Management (POEM) system for Service Availability Monitoring (SAM).
 Group:          Web application
@@ -69,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 %pre 
 
 %changelog
+* Wed Mar 29 2017 Daniel Vrcic <[email protected]> - 1.0.4-1%{?dist}
+- ARGO-766 Remove SRMv2 service type mapping
 * Thu Dec 15 2016 Daniel Vrcic <[email protected]> - 1.0.3-1%{?dist}
 - ARGO-641 fixed group membership of newly created profiles
 - add missing copy module in group of profiles association code

poem/Poem/sync/poem-syncservtype.py

@@ -73,7 +73,6 @@ def main():
     if len(sfindb) != len(Feed_List) + 1:
         sfs = set([(feed['service_type_name'], feed['service_type_desc']) \
                 for feed in Feed_List])
-        sfs.add(('SRMv2', '[Site service] Storage Resource Manager. Mandatory for all sites running an SRM enabled storage element.'))
         cur = connection.cursor()
         try:
             if len(sfindb) < len(Feed_List) + 1: