kvm-cluster: update monitor options, allow to disable ansible promise check per VM

software/kvm/common.cfg

@@ -101,7 +101,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 7abec10f8e24e7a75935a0637a006329
+md5sum = f53c55c6a12c58baf650828c14ca171f
 download-only = true
 on-update = true
 
@@ -110,7 +110,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = d29f02443f48096f176c8ae78cc5596c
+md5sum = 6ef7e38526f024356743e77973f0fb5f
 download-only = true
 on-update = true
 
@@ -119,7 +119,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
 mode = 644
-md5sum = c420aae56ecd64c94814647b74d9a4fb
+md5sum = 700676dff4a3835a9d6cde015d91922e
 download-only = true
 on-update = true
 
@@ -136,7 +136,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-import.cfg.jinja2.in
-md5sum = 3177381b65b4b95ba29190a6ac03b771
+md5sum = d5d3b7debf3141913eac926830ea166d
 mode = 0644
 download-only = true
 on-update = true
@@ -155,7 +155,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
 mode = 644
-md5sum = 4c71fbd0f27616d945df9669c57d302e
+md5sum = 13276ead8cf5f9eda28e8dbda35a9bcf
 download-only = true
 on-update = true
 
@@ -186,7 +186,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/template/ansible-promise.in
-md5sum = d0bd07d5a7799b7aea7720ffdf46f322
+md5sum = 2036bf145f472f62ef8dee5e729328fd
 mode = 0644
 download-only = true
 filename = ansible-promise.in

software/kvm/instance-kvm-cluster-input-schema.json

@@ -157,17 +157,24 @@
       "description": "Text content which will be written in a file data of cluster http server. All VM will be able to download that file via the static URL of cluster HTTP server: https://10.0.2.101/FOLDER_HASH/data.",
       "type": "string"
     },
+    "enable-monitor": {
+      "title": "Enable Monitoring on this cluster",
+      "description": "Deploy monitor instance to this kvm instance. It help to check instance status, log and promise results.",
+      "type": "boolean",
+      "default": true
+    },
     "monitor-interface-url": {
         "title": "Monitor Web Interface URL",
         "description": "Give Url of HTML web interface that will be used to render this monitor instance.",
         "type": "string",
-        "format": "uri"
+        "format": "uri",
+        "default": "https://monitor.app.officejs.com"
     },
     "monitor-cors-domains": {
         "title": "Monitor CORS domains",
         "description": "List of cors domains separated with space. Needed for ajax query on this monitor instance from a different domain.",
         "type": "string",
-        "default": ""
+        "default": "monitor.app.officejs.com"
     },
     "kvm-partition-dict": {
       "title": "kvm instances definition",
@@ -377,11 +384,11 @@
               "description": "Text content which will be written in a file 'data' of http server of this virtual machine instance. The file will be available via URL: http://10.0.2.100/data in the VM.",
               "type": "string"
             },
-            "enable-monitor": {
-              "title": "Deploy monitoring tools",
-              "description": "Deploy monitor instance to this kvm instance. It help to check instance status, log and promise results.",
+            "disable-ansible-promise": {
+              "title": "Desactivate Ansible promise check",
+              "description": "If the VM of cluster doesn't run Ansible and report status to this SlapOS instances, then this allow to disable ansible promise so your instance will not fail to check ansible promise.",
               "type": "boolean",
-              "default": true
+              "default": false
             }
           },
           "type": "object"

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -9,6 +9,7 @@
 {% set kvm_instance_dict = {} -%}
 {% set kvm_hostname_list = [] -%}
 {% set monitor_url_list = [] -%}
+{% set enable_monitoring = slapparameter_dict.get('enable-monitor', True) -%}
 
 [request-common]
 recipe = slapos.cookbook:request
@@ -76,7 +77,8 @@ config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
 {% if kvm_parameter_dict.get('data-to-vm', '') -%}
 config-data-to-vm = {{ dumps(kvm_parameter_dict.get('data-to-vm', '')) }}
 {% endif -%}
-config-enable-monitor = {{ dumps(kvm_parameter_dict.get('enable-monitor', True)) }}
+config-disable-ansible-promise = {{ dumps(kvm_parameter_dict.get('disable-ansible-promise', False)) }}
+config-enable-monitor = {{ enable_monitoring }}
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 config-monitor-username = ${monitor-htpasswd:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
@@ -102,21 +104,21 @@ sla-fw_restricted_access = {{ dumps(slapparameter_dict.get('fw-restricted-access
 return = 
   url
   backend-url
-  monitor-base-url
 {% if str(use_nat).lower() == 'true' -%}
 {%   for port in nat_rules_list -%}
 {{ '  ' }}nat-rule-url-{{ port }}
 {%   endfor -%}
 {% endif -%}
+{% if enable_monitoring -%}
+{{ '  ' }}monitor-base-url
+{%    do monitor_url_list.append('${' ~ section ~ ':connection-monitor-base-url}') -%}
+{% endif -%}
 {% if str(kvm_parameter_dict.get('use-tap', 'True')).lower() == 'true' -%}
 {{ '  ' }}tap-ipv4
 
 {% do publish_dict.__setitem__('lan-' ~ instance_name, '${' ~ section ~ ':connection-tap-ipv4}') -%}
 {% do kvm_hostname_list.append(instance_name ~ ' ' ~ '${' ~ section ~ ':connection-tap-ipv4}') -%}
 {% endif -%}
-{% if str(kvm_parameter_dict.get('enable-monitor', 'True')).lower() == 'true' -%}
-{%  do monitor_url_list.append('${' ~ section ~ ':connection-monitor-base-url}') -%}
-{% endif -%}
 {% do publish_dict.__setitem__(instance_name ~ '-backend-url', '${' ~ section ~ ':connection-backend-url}') -%}
 {% do publish_dict.__setitem__(instance_name ~ '-url', '${' ~ section ~ ':connection-url}') -%}
 {% do kvm_instance_dict.__setitem__(instance_name, (use_nat, nat_rules_list)) -%}
@@ -232,7 +234,6 @@ username = admin
 
 [monitor-instance-parameter]
 monitor-httpd-port = 8060
-monitor-title = KVM Cluster Main Instance
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 username = ${monitor-htpasswd:username}
 password = ${monitor-htpasswd:passwd}
@@ -250,13 +251,18 @@ recipe = slapos.cookbook:publish
 {% for name, value in publish_dict.items() -%}
 {{   name }} = {{ value }}
 {% endfor %}
-{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
+{% if enable_monitoring -%}
+{%   set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
+{% do part_list.append('monitor-base') -%}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}&username=${publish:monitor-user}&password=${publish:monitor-password}
+{% endif -%}
 
 [buildout]
 extends = 
   {{ template_httpd_cfg }}
-  {{ template_monitor }}
+{% if enable_monitoring -%}
+{{ '  ' ~ template_monitor }}
+{% endif -%}
 
 parts = 
   httpd
@@ -265,9 +271,6 @@ parts =
   publish-connection-information
   directory-doc
 
-  monitor-base
-# End monitor
-
 # Complete parts with sections
   {{ part_list | join('\n  ') }}
  

software/kvm/instance-kvm-export.cfg.jinja2

-{% set monitor = True  -%}
 
-{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'false' -%}
-{%   set monitor = False  -%}
-{% endif -%}
+{%   set monitor = str(slapparameter_dict.get('enable-monitor', False)).lower() == 'true' -%}
 
 [buildout]
 extends =

software/kvm/instance-kvm-import.cfg.jinja2.in

@@ -8,7 +8,7 @@ offline = true
 # even extend the kvm instance profile.
 extends = 
   {{ pbsready_import_template }}
-{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
+{% if str(slapparameter_dict.get('enable-monitor', True)).lower() == 'true' -%}
 {{ '  ' ~ template_monitor }}
 
 [resilient-publish-connection-parameter]

software/kvm/instance-kvm-resilient.cfg.jinja2

@@ -5,8 +5,9 @@
 
 {% set backup_amount = slapparameter_dict.pop('resilient-clone-number', "1")|int + 1 -%}
 {% set monitor_dict = {} -%}
+{% set monitor_return = [] -%}
 
-{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
+{% if slapparameter_dict.get('enable-monitor', True) == True -%}
 {% set monitor_return = ['monitor-base-url'] -%}
 {% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.app.officejs.com")} -%}
 {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} -%}
@@ -25,7 +26,7 @@ parts +=
   kvm-frontend-url-promise
   kvm-backend-url-promise
 
-{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
+{% if monitor_dict -%}
 extends = {{ template_monitor }}
 
 
@@ -35,6 +36,11 @@ storage-path = ${directory:etc}/.monitor_user
 bytes = 8
 username = admin
 
+# XXX Monitoring Main Instane
+[monitor-instance-parameter]
+monitor-httpd-port = 8160
+cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }}
+
 {%  do monitor_parameter.__setitem__('monitor-username', slapparameter_dict.get('monitor-username', 'admin'))%}
 {%  do monitor_parameter.__setitem__('monitor-password', slapparameter_dict.get('monitor-password', '${monitor-htpasswd:passwd}'))%}
 {% endif -%}
@@ -56,18 +62,15 @@ return =
 # XXX: return ALL parameters (like nat rules), through jinja
   backend-url url ip
 
-# XXX Monitoring Main Instane
-[monitor-instance-parameter]
-monitor-httpd-port = 8160
-cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }}
-
 [publish-connection-information]
 recipe = slapos.cookbook:publish
 backend-url = ${request-kvm:connection-backend-url}
 url = ${request-kvm:connection-url}
 ipv6 = ${request-kvm:connection-ip}
+{% if monitor_dict -%}
 monitor-base-url = ${publish:monitor-base-url}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}&username=${publish:monitor-user}&password=${publish:monitor-password}
+{% endif -%}
 
 [kvm-frontend-url-promise]
 # Check that url parameter is complete

software/kvm/instance-kvm.cfg.jinja2

@@ -3,17 +3,13 @@
 {% set use_nat = slapparameter_dict.get('use-nat', 'True').lower() -%}
 {% set nat_restrict = slapparameter_dict.get('nat-restrict-mode', 'False').lower() -%}
 {% set name = slapparameter_dict.get('name', 'localhost') -%}
-{% set disable_ansible_promise = slapparameter_dict.get('disable-ansible-promise', 'False').lower() -%}
+{% set disable_ansible_promise = slapparameter_dict.get('disable-ansible-promise', 'True').lower() -%}
 {% set instance_type = slapparameter_dict.get('type', 'standalone') -%}
 {% set nat_rule_list = slapparameter_dict.get('nat-rules', '22 80 443') -%}
 {% set frontend_software_type = 'default' -%}
 {% set extends_list = [] -%}
 {% set part_list = [] -%}
-{% set monitor = True  -%}
-
-{% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'false' -%}
-{%   set monitor = False  -%}
-{% endif -%}
+{% set monitor = str(slapparameter_dict.get('enable-monitor', True)).lower() == 'true' -%}
 
 {% set bootstrap_url = '' -%}
 {% set bootstrap_url_md5sum = '' -%}
@@ -34,7 +30,6 @@
 {% do extends_list.append(template_monitor) -%}
 {% endif -%}
 {% do extends_list.append(logrotate_cfg) -%}
-
 [directory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
@@ -606,7 +601,7 @@ keyboard-layout-language = fr
 {% if slapparameter_dict.get('data-to-vm', '') %}
 {%   do part_list.append('vm-data-content') -%}
 {% endif -%}
-{% if use_tap == 'true' and tap_network_dict.has_key('ipv4') and disable_ansible_promise == 'false' %}
+{% if disable_ansible_promise == 'false' %}
 {%   do part_list.extend(['ansible-vm-promise', 'logrotate-vm-bootstrap']) -%}
 {% endif -%}
 {% if slapparameter_dict.get('authorized-key', '') and slapparameter_dict.get('type', '') == 'cluster' %}

software/kvm/software.cfg

 [buildout]
-extends = common.cfg
+#extends = common.cfg
+
+extends = development.cfg
 
 [versions]
 # XXX - use websockify = 0.5.1 for compatibility with kvm frontend

software/kvm/template/ansible-promise.in

@@ -36,6 +36,8 @@ def check_result():
   success_file = os.path.join(ansible_log_dir, result_OK)
   error_file = os.path.join(ansible_log_dir, result_failed)
 
+  if not os.path.exists(ansible_log_dir):
+    return (0, "File %s doesn't exist.\nThis mean that ansible report log is not uploaded yet!!!" % ansible_log_dir)
   if not len(os.listdir(ansible_log_dir)):
     return (0, 'No Ansible promise uploaded!')
   if os.path.exists(error_file):
@@ -54,4 +56,4 @@ if __name__ == "__main__":
   result = check_result()
   if not result[0]:
     raise Exception('Failed to run Ansible in %s, result is: \n%s' % (vm_name,
-                          result[1]))
+                          result[1]))
\ No newline at end of file