erp5trial

stack/erp5/buildout.cfg

@@ -48,13 +48,13 @@ extends =
   ../../component/dash/buildout.cfg
   ../../component/wget/buildout.cfg
   ../../component/aspell/buildout.cfg
-  ../../component/cloudooo/buildout.cfg
   ../../component/jsl/buildout.cfg
   ../../component/6tunnel/buildout.cfg
   ../../component/findutils/buildout.cfg
   ../../component/userhosts/buildout.cfg
   ../../component/postfix/buildout.cfg
   ../../software/ipython_notebook/software.cfg
+  ../../software/cloudooo/software-common.cfg
   ../../software/neoppod/software-common.cfg
 # keep neoppod extends last
 
@@ -116,7 +116,7 @@ parts +=
   android-fonts
 
 # Cloudooo specific part
-  cloudooo-develop
+  ${cloudooo-buildout:parts}
   cloudooo
 
 # get git repositories
@@ -174,11 +174,6 @@ link-binary =
 filename = instance-kumofs.cfg.in
 md5sum = 763db0c4a94649296e74fe1f53c03940
 
-[template-cloudooo]
-<= download-base
-filename = instance-cloudoo.cfg.in
-md5sum = 1eedc7ee93ac7c95e1c7d50a36ef2b01
-
 [template-zope-conf]
 <= download-base
 filename = zope.conf.in
@@ -234,7 +229,7 @@ recipe = slapos.recipe.template:jinja2
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 10d02ec69c875e6a55afe3bf79db7bba
+md5sum = ab5f4e9454e1a92ef3903193df6bef7e
 mode = 640
 context =
     key mariadb_link_binary template-mariadb:link-binary
@@ -293,7 +288,7 @@ context =
     key stunnel_location stunnel:location
     key template_apache_conf template-apache-backend-conf:target
     key template_balancer template-balancer:target
-    key template_cloudooo template-cloudooo:target
+    key template_cloudooo template-cloudooo-instance:target
     key template_create_erp5_site template-create-erp5-site:target
     key template_create_erp5_site_real template-create-erp5-site-real:target
     key template_erp5 template-erp5:target
@@ -319,6 +314,11 @@ context =
     key zlib_location zlib:location
     key extra_path_list eggs:extra-paths
 
+#  XXXXXX
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    section dynamic_template_cloudooo_instance_parameter_dict dynamic-template-cloudooo-instance-parameter-dict
+
 [monitor-template-dummy]
 <= download-base
 # This is a placeholder, to be overriden by extending monitor SR

stack/erp5/instance-cloudoo.cfg.in

-{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
-{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
-[buildout]
-extends =
-  {{ parameter_dict['template-monitor'] }}
-parts +=
-  publish
-  cloudooo-instance
-  resiliency-exclude-file
-  promise
-  promise-openoffice
-  {% if use_ipv6 %}promise-tunnel{% endif %}
-
-[publish]
-recipe = slapos.cookbook:publish.serialised
-{% if use_ipv6 -%}
-url = cloudooo://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
-{% else -%}
-url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
-{% endif -%}
-
-[cloudooo-instance]
-recipe = slapos.cookbook:generic.cloudooo
-
-# Network options
-ip = {{ (ipv4_set | list)[0] }}
-{% set tcpv4_port = slapparameter_dict['tcpv4-port'] -%}
-port = {{ tcpv4_port }}
-openoffice-port = {{ tcpv4_port + 1 }}
-
-# Paths
-configuration-file = ${directory:etc}/cloudooo.cfg
-wrapper = ${directory:service}/cloudooo
-
-# Paths: Data
-data-directory = ${directory:cloudooo-data}
-
-environment =
-  LD_LIBRARY_PATH = {{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib
-  FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
-
-# Binary information
-# cloudooo specific configuration
-ooo-binary-path = {{ parameter_dict['libreoffice-bin'] }}/program
-ooo-paster = {{ bin_directory }}/cloudooo_paster
-ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
-
-[fontconfig-instance]
-recipe = slapos.cookbook:fontconfig
-conf-path = ${directory:etc}/font.conf
-font-system-folder = {{ parameter_dict['fonts'] }}
-font-folder = ${directory:font}
-service-folder = ${directory:service}
-
-[resiliency-exclude-file]
-# Generate rdiff exclude file in case of resiliency
-recipe = collective.recipe.template
-input = inline: **
-output = ${directory:srv}/exporter.exclude
-
-[promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/cloudooo
-hostname = ${cloudooo-instance:ip}
-port = ${cloudooo-instance:port}
-
-[promise-openoffice]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/openoffice
-hostname = ${cloudooo-instance:ip}
-port = ${cloudooo-instance:openoffice-port}
-
-{% if use_ipv6 -%}
-[promise-tunnel]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/tunnel
-hostname = ${ipv6toipv4:ipv6}
-port = ${ipv6toipv4:ipv6-port}
-
-[ipv6toipv4]
-recipe = slapos.cookbook:ipv6toipv4
-runner-path = ${directory:service}/${:base-name}
-6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
-shell-path = {{ parameter_dict['dash'] }}/bin/dash
-ipv4 = ${cloudooo-instance:ip}
-ipv6 = {{ (ipv6_set | list)[0] }}
-ipv6-port = ${cloudooo-instance:port}
-ipv4-port = ${cloudooo-instance:port}
-base-name = cloudooo-tunnel
-
-{% endif -%}
-# rest of parts are candidates for some generic stuff
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = ${buildout:directory}/etc
-srv = ${buildout:directory}/srv
-service = ${:etc}/run
-promise = ${:etc}/promise
-cloudooo-data = ${:srv}/cloudooo
-font = ${:srv}/font
-
-[monitor-instance-parameter]
-monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
-monitor-httpd-port = {{ tcpv4_port + 2 }}
-monitor-title = Cloudooo monitor

stack/erp5/instance.cfg.in

@@ -6,43 +6,18 @@ context +=
     raw slapos_core_version {{ slapos_core_version }}
 
 [dynamic-template-cloudooo-parameters]
-cairo = {{ cairo_location }}
-cups = {{ cups_location }}
-dbus = {{ dbus_location }}
-dbus-glib = {{ dbus_glib_location }}
-file = {{ file_location }}
-fontconfig = {{ fontconfig_location }}
-freetype = {{ freetype_location }}
-glib = {{ glib_location }}
-glu = {{ glu_location }}
-libICE = {{ libICE_location }}
-libSM = {{ libSM_location }}
-libX11 = {{ libX11_location }}
-libXau = {{ libXau_location }}
-libXdmcp = {{ libXdmcp_location }}
-libXext = {{ libXext_location }}
-libXrender = {{ libXrender_location }}
-libexpat = {{ libexpat_location }}
-libffi = {{ libffi_location }}
-libpng12 = {{ libpng12_location }}
-libxcb = {{ libxcb_location }}
-mesa = {{ mesa_location }}
-pixman = {{ pixman_location }}
-xdamage = {{ xdamage_location }}
-xfixes = {{ xfixes_location }}
-zlib = {{ zlib_location }}
-libreoffice-bin = {{ libreoffice_bin_location }}
-fonts = {{ fonts_location }}
-buildout-bin-directory = {{ buildout_bin_directory }}
-6tunnel = {{ sixtunnel_location }}
-dash = {{ dash_location }}
-template-monitor = {{ dumps(template_monitor) }}
+{% for key, value in dynamic_template_cloudooo_instance_parameter_dict.items() -%}
+{{   key }} = {{ dumps(value) }}
+{% endfor -%}
+instance-parameter-dict = {{ dumps({"port": 2020, "backend-count": 3, "timeout": 600}) }}
 
 [dynamic-template-cloudooo]
 <= jinja2-template-base
 template = {{ template_cloudooo }}
 filename = instance-cloudoo.cfg
 extra-context =
+    raw develop_eggs_directory {{ develop_eggs_directory }}
+    raw eggs_directory {{ eggs_directory }}
     section parameter_dict dynamic-template-cloudooo-parameters
 
 [dynamic-template-postfix-parameters]