Commit 76cfa45d authored by Iliya Manolov's avatar Iliya Manolov Committed by Julien Muchembled

NEO: add a neoctl wrapper in every partition with an admin node

The purpose of the added script is to shorten calling neoctl by removing the
need to constantly supply things SlapOS can provide on its own like
certificates and admin address. A sample command is now as simple as:

    ~/srv/runner/instance/slappartX/bin/neoctl set cluster STARTING_BACKUP

/reviewed-on nexedi/slapos!120
parent 923a6e86
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
parts += parts +=
neo-admin-promise neo-admin-promise
logrotate-admin logrotate-admin
neoctl
[neo-admin] [neo-admin]
recipe = slapos.cookbook:neoppod.admin recipe = slapos.cookbook:neoppod.admin
...@@ -27,3 +28,15 @@ backup = ${logrotate:backup} ...@@ -27,3 +28,15 @@ backup = ${logrotate:backup}
name = neo-admin name = neo-admin
log = ${neo-admin:logfile} log = ${neo-admin:logfile}
post = {{ bin_directory }}/slapos-kill -n neoadmin -s RTMIN+1 ${:log} post = {{ bin_directory }}/slapos-kill -n neoadmin -s RTMIN+1 ${:log}
[neoctl]
recipe = slapos.cookbook:wrapper
command-line =
{{bin_directory}}/neoctl -a ${neo-admin:ip}:${neo-admin:port}
{%- if slapparameter_dict['ssl'] %}
--ca ${directory:etc}/ca.crt
--cert ${directory:etc}/neo.crt
--key ${directory:etc}/neo.key
{%- endif %}
parameters-extra = True
wrapper-path = ${directory:bin}/neoctl
...@@ -89,7 +89,7 @@ md5sum = f3259726bd5d824c569dc7db6b7d26a0 ...@@ -89,7 +89,7 @@ md5sum = f3259726bd5d824c569dc7db6b7d26a0
[instance-neo-admin] [instance-neo-admin]
<= download-base-neo <= download-base-neo
md5sum = f030a25d320f2edf0186b69bfa521228 md5sum = ec1e2d9d2a1da092621f1b01ce6af322
[instance-neo-master] [instance-neo-master]
<= download-base-neo <= download-base-neo
......
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