From 76cfa45dd9c7c66b32ec9289237d332591fa2500 Mon Sep 17 00:00:00 2001
From: Iliya Manolov <ilmanfordinner@gmail.com>
Date: Tue, 6 Dec 2016 14:50:46 +0100
Subject: [PATCH] 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 https://lab.nexedi.com/nexedi/slapos/merge_requests/120
---
 software/neoppod/instance-neo-admin.cfg.in | 13 +++++++++++++
 software/neoppod/software-common.cfg       |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/software/neoppod/instance-neo-admin.cfg.in b/software/neoppod/instance-neo-admin.cfg.in
index eaa5fd543a..518a171b9d 100644
--- a/software/neoppod/instance-neo-admin.cfg.in
+++ b/software/neoppod/instance-neo-admin.cfg.in
@@ -2,6 +2,7 @@
 parts +=
   neo-admin-promise
   logrotate-admin
+  neoctl
 
 [neo-admin]
 recipe = slapos.cookbook:neoppod.admin
@@ -27,3 +28,15 @@ backup = ${logrotate:backup}
 name = neo-admin
 log = ${neo-admin:logfile}
 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
diff --git a/software/neoppod/software-common.cfg b/software/neoppod/software-common.cfg
index dc680733be..8d510c6f6a 100644
--- a/software/neoppod/software-common.cfg
+++ b/software/neoppod/software-common.cfg
@@ -89,7 +89,7 @@ md5sum = f3259726bd5d824c569dc7db6b7d26a0
 
 [instance-neo-admin]
 <= download-base-neo
-md5sum = f030a25d320f2edf0186b69bfa521228
+md5sum = ec1e2d9d2a1da092621f1b01ce6af322
 
 [instance-neo-master]
 <= download-base-neo
-- 
2.25.1