NEO: by default, instantiate an admin node when there's a master node

Since commit ebc1636d ("instanciate a
single admin node, by default in the first subpartition"), there was
only 1 admin node (and 1 neoctl wrapper) and this was inconvenient if
the partition hosting it lost.

Only 1 admin node does monitoring.

software/neoppod/buildout.hash.cfg

@@ -18,11 +18,11 @@ md5sum = 80599fcc6e5d07270d7900aebfd62139
 
 [root-common]
 filename = root-common.cfg.in
-md5sum = c03fbfc9df9edc1ef60be970e0627c5e
+md5sum = 8e28f599247ad604ec6e32df410412a8
 
 [instance-neo-admin]
 filename = instance-neo-admin.cfg.in
-md5sum = 87670ddc6b5d2007dac1b6d2ba86d168
+md5sum = ccd9dced3e971e8c60ae7e7b25d23f60
 
 [instance-neo-master]
 filename = instance-neo-master.cfg.in
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
 
 [instance-neo]
 filename = instance-neo.cfg.in
-md5sum = 512383220488335ac186013c2ffdc7c1
+md5sum = 7642c760a2c5af3e3e81c2c54486d1a8
 
 [template-neo-my-cnf]
 filename = my.cnf.in

software/neoppod/instance-neo-admin.cfg.in

 {%- if slapparameter_dict.get('admin') != 0 %}
-{%- set monitor_dict = slapparameter_dict['monitor'] %}
+{%- set monitor_dict = slapparameter_dict.get('monitor', {}) %}
 {%- set bang_on_problem = monitor_dict.pop('bang-on-problem', None) %}
 {%- set periodicity = monitor_dict.pop('periodicity', None) %}
+{%- set monitor_passwd = slapparameter_dict.get('monitor-passwd') %}
 
 [buildout]
-extends =
-  {{ template_monitor }}
 parts +=
   logrotate-admin
+{%- if monitor_passwd != None %}
   monitor-neo-health
+extends =
+  {{ template_monitor }}
+
+[directory]
+plugin =  ${:etc}/plugin
+
+[monitor-neo-health]
+<= monitor-promise-base
+module = check_neo_health
+name = ${:_buildout_section_name_}.py
+config-neoctl = ${neoctl:wrapper-path}
+{%- if bang_on_problem != None %}
+config-bang-on-problem = {{ dumps(bang_on_problem) }}
+{%- endif %}
+{%- if periodicity != None %}
+config-periodicity = {{ dumps(periodicity) }}
+{%- endif %}
+
+[monitor-instance-parameter]
+monitor-httpd-port = {{ slapparameter_dict.get('monitor-port', 2052) }}
+monitor-title = neo
+password = {{ monitor_passwd }}
+{%- endif %}
 
 [neo-admin]
 recipe = slapos.cookbook:neoppod.admin
@@ -33,26 +56,6 @@ extra-options =
 {%-   endfor %}
 {%- endfor %}
 
-[directory]
-plugin =  ${:etc}/plugin
-
-[monitor-neo-health]
-<= monitor-promise-base
-module = check_neo_health
-name = ${:_buildout_section_name_}.py
-config-neoctl = ${neoctl:wrapper-path}
-{%- if bang_on_problem != None %}
-config-bang-on-problem = {{ dumps(bang_on_problem) }}
-{%- endif %}
-{%- if periodicity != None %}
-config-periodicity = {{ dumps(periodicity) }}
-{%- endif %}
-
-[monitor-instance-parameter]
-monitor-httpd-port = {{ slapparameter_dict.get('admin', 2050) + 1 }}
-monitor-title = neo
-password = {{ slapparameter_dict['monitor-passwd'] }}
-
 [logrotate-admin]
 < = logrotate-entry-base
 name = neo-admin

software/neoppod/instance-neo-input-schema.json

@@ -82,15 +82,18 @@
           "additionalProperties": false,
           "properties": {
             "admin": {
-              "description": "Port of admin node. 0 to disable.",
-              "default": 2050,
+              "description": "Admin port, 0 to disable. Default to 2050 if the node has a master, 0 otherwise.",
               "type": "integer"
             },
             "master": {
-              "description": "Port of master node. 0 to disable.",
+              "description": "Master port, 0 to disable.",
               "default": 2051,
               "type": "integer"
             },
+            "monitor": {
+              "description": "Monitor port, 0 to disable. Unless explicitly set by a node, the first one with an admin gets a monitor at port 2052.",
+              "type": "integer"
+            },
             "storage-count": {
               "description": "Number of storage nodes to deploy. One master and one admin node is deployed with each storage.",
               "default": 1,

software/neoppod/instance-neo.cfg.in

@@ -65,7 +65,7 @@ recipe = slapos.cookbook:publish.serialised
 # TODO: make port a partition parameter
 ip = {{ "[%s]" % list(ipv6_set)[0] if ipv6_set else list(ipv4_set)[0] }}
 {% set admin = slapparameter_dict.get('admin', 2050) -%}
-{% set master = slapparameter_dict.get('master', 2052) -%}
+{% set master = slapparameter_dict.get('master', 2051) -%}
 {% if master -%}
 port-master = {{ master }}
 master = ${:ip}:${:port-master}
@@ -75,10 +75,12 @@ master =
 {% if admin -%}
 port-admin = {{ admin }}
 admin = ${:ip}:${:port-admin}
+{%-   if 'monitor-passwd' in slapparameter_dict %}
 monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
-{% else -%}
+{%-   endif %}
+{%- else %}
 admin =
-{% endif -%}
+{%- endif %}
 
 {#- Hack to deploy SSL certs via instance parameters #}
 {%- for name, pem in zip(('ca.crt', 'neo.crt', 'neo.key'),

software/neoppod/root-common.cfg.in

@@ -88,13 +88,26 @@ software-type = {{ software_type }}
 {% endfor -%}
 config-autostart = {{ dumps(sum(storage_count)) }}
 {%- do assert(replicas < len(node_list)) %}
-{%- set admin_list = [] %}
+{%- set monitor = set() %}
+{%- for i, node in enumerate(node_list) %}
+{%-   set port = node.get('monitor') %}
+{%-   if port %}
+{%-     do monitor.add(node.get('admin') != 0 and port) %}
+{%-   endif %}
+{%- endfor %}
+{%- if False in monitor %}
+{%-   do monitor.remove(False) %}
+{%-   do assert(monitor) %}
+{%- endif %}
 {%- for i, node in enumerate(node_list) %}
 {%-   set section_id =  prefix ~ i %}
 {%-   do section_id_list.append(section_id) %}
-{%-   if admin_list %}
+{%-   if node.get('master') == 0 and not node.get('monitor') %}
 {%-     do node.setdefault('admin', 0) %}
 {%-   endif %}
+{%-   if monitor or node.get('admin') == 0 %}
+{%-     do node.setdefault('monitor', 0) %}
+{%-   endif %}
 
 [{{section_id}}]
 <= {{ prefix }}request-common
@@ -102,14 +115,21 @@ name = {{ section_id }}
 return =
   master
   admin
-{%-   if node.get('admin') != 0 %}
+{%-   set port = node.pop('monitor', None) %}
+{%-   if port != 0 or node.get('admin') != 0 and not monitor %}
+{%-     if port != 0 %}
   monitor-base-url
-{%-     if monitor_base_url_dict != None %}
-{%-       do monitor_base_url_dict.__setitem__('neo',
-            '${' ~ section_id ~ ':connection-monitor-base-url}') %}
-{%-     endif %}
-{%-     do admin_list.append(section_id) %}
+{%-       if monitor_base_url_dict != None %}
+{%-         do monitor_base_url_dict.__setitem__('neo',
+              '${' ~ section_id ~ ':connection-monitor-base-url}') %}
+{%-       endif %}
 config-monitor-passwd = ${monitor-htpasswd:passwd}
+{%-     endif %}
+{%-     if port %}
+config-monitor-port = {{ dumps(port) }}
+{%-     else %}
+{%-       do monitor.add(None) %}
+{%-     endif %}
 config-monitor = {{ dumps(parameter_dict.get('monitor', {})) }}
 {%-   endif %}
 {%-   for k, v in node.iteritems() %}
@@ -117,7 +137,7 @@ config-{{ k }} = {{ dumps(v) }}
 {%-   endfor %}
 {{ sla(section_id) }}
 {%- endfor %}
-{%- do assert(len(admin_list) == 1, admin_list) %}
+{%- do assert(len(monitor) == 1, monitor) %}
 
 [{{section(prefix ~ 'cluster')}}]
 recipe = slapos.cookbook:neoppod.cluster