onetimeupload: remove 'generic' in name of recipe

e66a813b · Cédric de Saint Martin · 86fbfaad · e66a813b · e66a813b · e66a813b
Commit e66a813b authored May 26, 2012 by Cédric de Saint Martin
4 changed files
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ setup(name=name,
          'generate_output_if_input_not_null = slapos.recipe.generate_output_if_input_not_null:Recipe',
          'generate.mac = slapos.recipe.generatemac:Recipe',
          'nbdserver = slapos.recipe.nbdserver:Recipe',
-          'generic.onetimeupload = slapos.recipe.generic_onetimeupload:Recipe',
+          'onetimeupload = slapos.recipe.onetimeupload:Recipe',
          'helloworld = slapos.recipe.helloworld:Recipe',
          'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
          'firefox = slapos.recipe.firefox:Recipe',

--- a/slapos/recipe/generic_onetimeupload/__init__.py
+++ b/slapos/recipe/generic_onetimeupload/__init__.py
--- a/slapos/recipe/generic_onetimeupload/template/onetimeupload_run.in
+++ b/slapos/recipe/generic_onetimeupload/template/onetimeupload_run.in
--- a/software/kvm/instance-nbd.cfg
+++ b/software/kvm/instance-nbd.cfg
@@ -41,7 +41,7 @@ hostname = $${nbd-instance:ip}
 port = $${nbd-instance:port}
 [onetimeupload-instance]
-recipe = slapos.cookbook:generic.onetimeupload
+recipe = slapos.cookbook:onetimeupload
 ip = $${slap-network-information:global-ipv6}
 port = 9999
 image-path = $${rootdirectory:srv}/cdrom.iso