set default monitor interface-url and cors domain for kvm and webrunner SR

software/kvm/common.cfg

@@ -98,7 +98,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 38ebf7e22e674b9cb579592755b32e6b
+md5sum = de733ac612bf498199e68d1d6b7d8ac9
 download-only = true
 on-update = true
 
@@ -106,7 +106,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 606e5475a461f5e6d93b3414cbc8ccc2
+md5sum = 24a717e6ccadf5708b8d5d82a75a7b25
 download-only = true
 on-update = true
 
@@ -114,7 +114,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
 mode = 644
-md5sum = 6c55729e6048ad9936c7bfd0671bf07b
+md5sum = c8481ad7ef56b245e89df76cd19242db
 download-only = true
 on-update = true
 

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

@@ -72,7 +72,7 @@ config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
 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-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', '') }}
+config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
 config-monitor-username = ${monitor-htpasswd:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
 
@@ -240,7 +240,7 @@ recipe = slapos.cookbook:publish
 {% for name, value in publish_dict.items() -%}
 {{   name }} = {{ value }}
 {% endfor %}
-{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', '') -%}
+{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
 {% if monitor_interface_url -%}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
 {%   endif -%}

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

@@ -167,13 +167,14 @@
         "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.node.vifib.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.node.vifib.com"
     },
     "enable-http-server": {
       "title": "Enable local http server",

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

@@ -8,10 +8,10 @@
 
 {% if slapparameter_dict.get('enable-monitor', 'True').lower() == 'true' -%}
 {% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
-{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "")} -%}
+{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.node.vifib.com")} -%}
 {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return} -%}
 {% endif -%}
-{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', '') -%}
+{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
 
 [buildout]
 eggs-directory = {{ eggs_directory }}

software/kvm/instance-kvm.cfg.jinja2

@@ -320,7 +320,7 @@ port = ${httpd:port}
 [monitor-instance-parameter]
 monitor-httpd-port = 8026
 monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', '') }}
+cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
 {%   if slapparameter_dict.get('monitor-username', '') -%}
 username = {{ slapparameter_dict['monitor-username'] }}
 {%   endif -%}
@@ -369,7 +369,7 @@ monitor-base-url = ${publish:monitor-base-url}
 monitor-url = ${publish:monitor-url}
 monitor-user = ${publish:monitor-user}
 monitor-password = ${publish:monitor-password}
-{%   set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', '') -%}
+{%   set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
 {%   if monitor_interface_url -%}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${publish:monitor-url}
 {%   endif -%}

software/slaprunner/common.cfg

@@ -54,7 +54,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = c1c81a2042f262a52657da3d427222e4
+md5sum = 315f8d0e391fbe81e815e143470f1b92
 mode = 0644
 
 [template-runner-import-script]
@@ -90,7 +90,7 @@ mode = 0644
 [template-resilient]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = 3a0559633e10c4f3013355550859ca94
+md5sum = 1721ed960ae5b9ae55864bcdc5b1d487
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient.cfg.jinja2

@@ -11,9 +11,9 @@
   {% set number_of_instances = 2 %}
 {% endif %}
 {% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
-{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "")} -%}
+{% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.node.vifib.com")} -%}
 {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%}
-{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', '') -%}
+{% set monitor_interface_url = slapparameter_dict.pop('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
 
 {% import 'parts' as parts %}
 {% import 'replicated' as replicated %}

software/slaprunner/instance-runner-input-schema.json

@@ -102,13 +102,14 @@
             "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.node.vifib.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.node.vifib.com"
         },
         "cpu-usage-ratio": {
             "title": "CPU Usage Ratio",

software/slaprunner/instance-runner.cfg

@@ -477,7 +477,7 @@ monitor-base-url = $${publish:monitor-base-url}
 monitor-url = $${publish:monitor-url}
 monitor-user = $${publish:monitor-user}
 monitor-password = $${publish:monitor-password}
-{% if slapparameter_dict.get('monitor-interface-url', '') -%}
+{% if slapparameter_dict.get('monitor-interface-url', 'https://monitor.node.vifib.com') -%}
 monitor_setup_url = {{ slapparameter_dict['monitor-interface-url'] }}/#page=settings_configurator&url=$${publish:monitor-url}
 {% endif -%}
 #---------------------------
@@ -721,7 +721,7 @@ monitor-httpd-port = $${slap-parameter:monitor-port}
 {% if slapparameter_dict.get('name', '') -%}
 monitor-title = {{ slapparameter_dict['name'] }}
 {% endif -%}
-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', '') }}
+cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
 {% if slapparameter_dict.get('monitor-username', '') -%}
 username = {{ slapparameter_dict['monitor-username'] }}
 {% endif -%}