Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
osie
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
osie
Commits
feb99c63
Commit
feb99c63
authored
Jun 18, 2021
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for first working OSIE coupler under SlapOS.
parent
e290cd7e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
12 deletions
+8
-12
slapos/software/osie-coupler/buildout.hash.cfg
slapos/software/osie-coupler/buildout.hash.cfg
+3
-1
slapos/software/osie-coupler/instance.cfg.in
slapos/software/osie-coupler/instance.cfg.in
+2
-5
slapos/software/osie-coupler/software.cfg
slapos/software/osie-coupler/software.cfg
+3
-6
No files found.
slapos/software/osie-coupler/buildout.hash.cfg
View file @
feb99c63
# XXX: use later
[instance-profile]
filename = instance.cfg.in
md5sum = 5e108052b05425079e29dc7015a0f535
slapos/software/osie-coupler/instance.cfg.in
View file @
feb99c63
#############################
#############################
#
#
# 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
...
...
slapos/software/osie-coupler/software.cfg
View file @
feb99c63
...
@@ -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-templat
e]
[
instance-profil
e]
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}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment