re6st-registry: Refactor integration with re6st registry

  * Follow up methods changes on re6stnet registry API.
  * getIPv4Information was simplifed on registry, so reimplement it.
  * Remove scripts generated and keep a single script to orchestate the token management.
  * Drop some code duplication
  * Remove babeld, openvpn and miniupnp as they are not required.
  * Remove useless scripts.
  * Remove re6stnet section, extra-eggs is more them enough and prevent duplications.

slapos/recipe/re6stnet/__init__.py

@@ -218,24 +218,6 @@ class Recipe(GenericBaseRecipe):
       )
     path_list.append(request_add)
 
-    request_drop = self.createPythonScript(
-        self.options['drop-service-wrapper'].strip(),
-        '%s.re6stnet.requestRemoveToken' % __name__, service_dict
-      )
-    path_list.append(request_drop)
-
-    request_check = self.createPythonScript(
-        self.options['check-service-wrapper'].strip(),
-        '%s.re6stnet.checkService' % __name__, service_dict
-      )
-    path_list.append(request_check)
-
-    revoke_check = self.createPythonScript(
-        self.options['revoke-service-wrapper'].strip(),
-        '%s.re6stnet.requestRevoqueCertificate' % __name__, service_dict
-      )
-    path_list.append(revoke_check)
-
     # Send connection parameters of slave instances
     if token_dict:
       self.slap.initializeConnection(self.server_url, self.key_file,

software/re6stnet/instance-re6stnet.cfg.in

@@ -138,9 +138,6 @@ command = {{ re6st_registry }}
 wrapper = ${directory:services}/re6st-registry
 pid-file = ${directory:run}/registry.pid
 manager-wrapper = ${directory:bin}/re6stManageToken
-check-service-wrapper = ${directory:bin}/re6stCheckService
-drop-service-wrapper = ${directory:bin}/re6stManageDeleteToken
-revoke-service-wrapper = ${directory:bin}/re6stRevokeCertificate
 openssl-bin = {{ openssl_bin }}/openssl
 python-bin = {{ python_bin }}
 ipv6-prefix = {{ slapparameter_dict.get('ipv6-prefix', '2001:db8:24::/48') }}
@@ -167,26 +164,12 @@ recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:script}/re6st-token-manager
 command-line = "{{ python_bin }}" ${re6st-registry:manager-wrapper}
 
-[cron-entry-re6st-check]
+[cron-entry-re6st-manage]
 recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}
 name = re6stnet-check-token
 frequency = */5 * * * *
-command = {{ python_bin }} ${re6st-registry:check-service-wrapper}
-
-[cron-entry-re6st-revoke]
-recipe = slapos.cookbook:cron.d
-cron-entries = ${cron:cron-entries}
-name = re6stnet-revoke-cert
-frequency = */5 * * * *
-command = {{ python_bin }} ${re6st-registry:revoke-service-wrapper}
-
-[cron-entry-re6st-drop]
-recipe = slapos.cookbook:cron.d
-cron-entries = ${cron:cron-entries}
-name = re6stnet-drop-token
-frequency = */5 * * * *
-command = {{ python_bin }} ${re6st-registry:drop-service-wrapper}
+command = {{ python_bin }} ${re6st-registry:manager-wrapper}
 
 [logrotate-entry-re6stnet]
 < = logrotate-entry-base
@@ -227,9 +210,7 @@ parts =
   logrotate-entry-re6stnet
   re6stnet-manage
   cron-entry-logrotate
-  cron-entry-re6st-check
-  cron-entry-re6st-drop
-  cron-entry-re6st-revoke
+  cron-entry-re6st-manage
   apache-httpd
   apache-httpd-graceful
   publish

software/re6stnet/software.cfg

 [buildout]
 
 extends =
-  ../../component/re6stnet/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/gzip/buildout.cfg
@@ -23,8 +22,6 @@ parts +=
   slapos-cookbook
   eggs
   dash
-  babeld
-  re6stnet
   template
 
 [eggs]
@@ -45,7 +42,6 @@ eggs =
   ${python-cffi:egg}
   ${python-cryptography:egg}
   pyOpenSSL
-  miniupnpc
   re6stnet
 
 [download-base]
@@ -87,7 +83,7 @@ extra-context =
 [template-re6stnet]
 < = download-base
 filename = instance-re6stnet.cfg.in
-md5sum = 6e9452d283e82e2f512a9f9edb17fe3a
+md5sum = 4596d91cef4184b97d257a68478b6330
 
 [template-apache-conf]
 < = download-base