summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2018-02-11 16:50:54 +0100
committerChristian Pointner <equinox@spreadspace.org>2018-02-11 16:50:54 +0100
commit8eb938f0c8034f9d246351994cd70b3e4f767f92 (patch)
tree8aacef6d2ee6d038a704d5074637dc67ce484d24 /src
parentformatting cleanup (diff)
add worker flags for streamer
Diffstat (limited to 'src')
-rw-r--r--src/examples/elevate2018.yml7
-rwxr-xr-xsrc/flufigut.py6
2 files changed, 11 insertions, 2 deletions
diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml
index 4c40a5d..717263d 100644
--- a/src/examples/elevate2018.yml
+++ b/src/examples/elevate2018.yml
@@ -49,7 +49,8 @@ globals:
deployment:
type: kubernetes
parameter:
- image_version: 12
+ flumotion_image_version: 12
+ nginx_image_version: 4
inputs:
sdi-orig:
type: decklink
@@ -81,17 +82,21 @@ muxes:
streams:
local:
muxes: [ av-orig, audio-orig ]
+ nginx-muxes: [ av-orig ]
type: http
count: 1
port: 8000
+ nginx-port: 8000
max-con: 100
burst-on-connect: 5
hostname: elevate-feed.spreadspace.org
public:
muxes: [ av-orig, audio-orig ]
+ nginx-muxes: [ av-orig ]
type: http
count: 4
port: 8000
+ nginx-port: 8000
max-bw: 290000000
burst-on-connect: 5
hostname: "elevate-live%i.spreadspace.org"
diff --git a/src/flufigut.py b/src/flufigut.py
index 5bdff0a..6be8cb2 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -493,6 +493,8 @@ class Planet:
comp_name = '%s-%s%i-stream-%s-%s-%s' % (stream['type'], stream_name, idx + 1, mux, format, profile)
mount_point = '/%s-%s-%s.%s' % (mux, format, profile, self._desc.globals['formats'][format]['muxer'])
+ worker = self.__get_worker(comp_name)
+
hostname = stream['hostname']
hostname_next = None
if cnt > 1:
@@ -506,7 +508,7 @@ class Planet:
'type': "%s-stream" % stream['type'],
'desc': "%s streamer for %s %s-%s (part %i of %i in %s cluster)" % (
stream['type'], mux, format, profile, idx + 1, cnt, stream_name),
- 'worker': str(self.__get_worker(comp_name)),
+ 'worker': str(worker),
'feeder': feeder,
'properties': {
'description': self._desc.globals['description'],
@@ -521,6 +523,8 @@ class Planet:
}
self.__set_stream_mux_instance_props(comp_name, stream, porter.port, mount_point, hostname_next)
self.__add_stream_mux_instance_plugs(comp_name, stream_name, idx, mux, format, profile)
+ self.__add_worker_flag(worker, "stream", stream_name)
+ self.__add_worker_flag(worker, "stream-hostname-%s" % stream_name, hostname)
def __generate_stream_instance(self, stream_name, stream, idx, cnt):
port = stream['port']