Commit feb99c63 authored by Ivan Tyagov's avatar Ivan Tyagov

Fixes for first working OSIE coupler under SlapOS.

parent e290cd7e
# XXX: use later [instance-profile]
filename = instance.cfg.in
md5sum = 5e108052b05425079e29dc7015a0f535
############################# #############################
# #
# Deploy hello-world instance # Deploy OSIE coupler instance
# #
############################# #############################
[buildout] [buildout]
...@@ -76,8 +76,7 @@ logfile = ${directory:log}/helloweb-${:kind}.log ...@@ -76,8 +76,7 @@ logfile = ${directory:log}/helloweb-${:kind}.log
# This recipe will try to "exec" the command-line after separating parameters. # This recipe will try to "exec" the command-line after separating parameters.
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = command-line =
{{ buildout['bin-directory'] }}/helloweb-${:kind} --logfile ${:logfile} {{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['parts-directory'] }}/osie/eggs/osie_coupler/osie_modbus.py
${:ipv6} ${:port} ${instance-parameter:configuration.name}
# Put this shell script in the "etc/service" directory. Each executable of this # Put this shell script in the "etc/service" directory. Each executable of this
# repository will be started and monitored by supervisord. If a service # repository will be started and monitored by supervisord. If a service
# exits/crashes, it will trigger a "bang" and cause a re-run of the instance. # exits/crashes, it will trigger a "bang" and cause a re-run of the instance.
...@@ -108,8 +107,6 @@ config-port = {{ port }} ...@@ -108,8 +107,6 @@ config-port = {{ port }}
# services instantiation # services instantiation
{{ hellowebsrv('python', 7777) }} {{ hellowebsrv('python', 7777) }}
{{ hellowebsrv('ruby', 7778) }}
{{ hellowebsrv('go', 7779) }}
# register all services/promises to buildout parts # register all services/promises to buildout parts
......
...@@ -11,6 +11,7 @@ parts = ...@@ -11,6 +11,7 @@ parts =
osie-repository osie-repository
python-interpreter python-interpreter
osie-coupler-egg osie-coupler-egg
slapos-cookbook
instance-profile instance-profile
# fix for pypi: https://mail.python.org/pipermail/distutils-sig/2017-October/031712.html # fix for pypi: https://mail.python.org/pipermail/distutils-sig/2017-October/031712.html
...@@ -84,17 +85,13 @@ pyA20Lime2 = 0.2.1 ...@@ -84,17 +85,13 @@ pyA20Lime2 = 0.2.1
docutils = 0.17.1 docutils = 0.17.1
mistune = 0.8.4 mistune = 0.8.4
[jinja-template] [instance-profile]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/${:filename} template = ${:_profile_base_location_}/${:filename}
mode = 0644 mode = 0644
[instance-profile]
# The <= is buildout verb to use defined template
<= jinja-template
rendered = ${buildout:directory}/instance.cfg rendered = ${buildout:directory}/instance.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
filename = instance.cfg.in #filename = instance.cfg.in
context = context =
section buildout buildout section buildout buildout
raw template_monitor ${monitor2-template:rendered} raw template_monitor ${monitor2-template:rendered}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment