software/gitlab: switch to switch-softwaretype

software/gitlab/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance.cfg]
 filename = instance.cfg.in
-md5sum = dc3f318e8a3aa7a59f9394118543e9e3
+md5sum = 47e8092404feaf3f28ee6469523689ac
 
 [watcher]
 _update_hash_filename_ = watcher.in
@@ -54,7 +54,7 @@ md5sum = 0f1ec4077dab586cc003ae13f689eda2
 
 [instance-gitlab.cfg.in]
 _update_hash_filename_ = instance-gitlab.cfg.in
-md5sum = 64ec65b2daa0648453022f3afcbc4da3
+md5sum = 6b34d4b96ae0067977fa509046d71231
 
 [instance-gitlab-export.cfg.in]
 _update_hash_filename_ = instance-gitlab-export.cfg.in

software/gitlab/instance-gitlab.cfg.in

@@ -5,7 +5,6 @@
 #      throughput compared to tcp over loopback).
 [buildout]
 extends =
-  {{ gitlab_parameters_cfg }}
   {{ monitor_template }}
 parts =
     directory
@@ -50,26 +49,15 @@ offline = true
 ##################################
 
 [instance-parameter]
-# std stuff to fetch slapos instance parameters
-recipe  = slapos.cookbook:slapconfiguration
-computer= ${slap-connection:computer-id}
-partition=${slap-connection:partition-id}
-url     = ${slap-connection:server-url}
-key     = ${slap-connection:key-file}
-cert    = ${slap-connection:cert-file}
+{#- There are dangerous keys like recipe, etc #}
+{#- XXX: Some other approach would be useful #}
+{%- set DROP_KEY_LIST = ['recipe', '__buildout_signature__', 'computer', 'partition', 'url', 'key', 'cert'] %}
+{%- for key, value in instance_parameter_dict.iteritems() -%}
+{%-   if key not in DROP_KEY_LIST %}
+{{ key }} = {{ value }}
+{%-   endif -%}
+{%- endfor %}
 
-# autogenerated gitlab instance parameters
-<= gitlab-parameters
-
-# adjust/override some default settings:
-
-# automatically load all available CPUs
-configuration.unicorn_worker_processes  = {{ multiprocessing.cpu_count() + 1 }}
-configuration.nginx_worker_processes    = {{ multiprocessing.cpu_count() }}
-
-
-# gitlab non-native parameters
-configuration.icp_license  =
 
 
 # for convenience

software/gitlab/instance.cfg.in

 # GitLab "switch-softwaretype" instance
 [buildout]
-parts = switch-softwaretype
+extends =
+  ${gitlab-parameters.cfg:target}
+parts =
+    switch-softwaretype
 
 # std stuff for slapos instance
 eggs-directory = ${buildout:eggs-directory}
@@ -9,14 +12,46 @@ offline = true
 
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-gitlab  = $${instance-gitlab.cfg:rendered}
-gitlab-export   = $${instance-gitlab-export.cfg:rendered}
-gitlab-test = $${instance-gitlab-test.cfg:rendered}
-default = $${:gitlab}
+recipe = slapos.cookbook:switch-softwaretype
+gitlab = instance-gitlab.cfg:rendered
+gitlab-export = instance-gitlab-export.cfg:rendered
+gitlab-test = instance-gitlab-test.cfg:rendered
+RootSoftwareInstance = $${:gitlab}
 # TODO -import, -pull-backup
 
 
+[worker-processes]
+recipe = slapos.recipe.build
+init =
+  import multiprocessing
+  cpu_count = multiprocessing.cpu_count()
+  # automatically load all available CPUs
+  options['unicorn-worker-processes'] = cpu_count + 1
+  options['nginx-worker-processes'] = cpu_count
+
+
+[slap-configuration]
+# std stuff to fetch slapos instance parameters
+recipe  = slapos.cookbook:slapconfiguration
+computer= $${slap-connection:computer-id}
+partition=$${slap-connection:partition-id}
+url     = $${slap-connection:server-url}
+key     = $${slap-connection:key-file}
+cert    = $${slap-connection:cert-file}
+
+# autogenerated gitlab instance parameters
+<= gitlab-parameters
+
+# adjust/override some default settings:
+
+configuration.unicorn_worker_processes = $${worker-processes:unicorn-worker-processes}
+configuration.nginx_worker_processes   = $${worker-processes:nginx-worker-processes}
+
+
+# gitlab non-native parameters
+configuration.icp_license  =
+
+
 # macro: render instance-*.cfg from instance-*.cfg.in
 [instance-cfg]
 recipe  = slapos.recipe.template:jinja2
@@ -25,13 +60,13 @@ rendered= $${buildout:directory}/$${:_buildout_section_name_}
 context =
     import os os
     import pwd pwd
-    import multiprocessing multiprocessing
 
     key bin_directory           buildout:bin-directory
     key eggs_directory          buildout:eggs-directory
     key develop_eggs_directory  buildout:develop-eggs-directory
     raw gitlab_repository_location          ${gitlab-repository:location}
     raw gitlab_shell_repository_location    ${gitlab-shell-repository:location}
+    section instance_parameter_dict slap-configuration
 
 # program binaries
     raw bash_bin                    ${bash:location}/bin/bash
@@ -67,7 +102,6 @@ context =
 # config files
     raw database_yml_in             ${database.yml.in:target}
     raw gitconfig_in                ${gitconfig.in:target}
-    raw gitlab_parameters_cfg       ${gitlab-parameters.cfg:target}
     raw monitor_template            ${monitor2-template:rendered}
     raw gitlab_shell_config_yml_in  ${gitlab-shell-config.yml.in:target}
     raw gitlab_unicorn_startup_in   ${gitlab-unicorn-startup.in:target}