Merge "Disable encryption"
diff --git a/tcp_tests/managers/saltmanager.py b/tcp_tests/managers/saltmanager.py
index b2abdce..272621a 100644
--- a/tcp_tests/managers/saltmanager.py
+++ b/tcp_tests/managers/saltmanager.py
@@ -298,7 +298,8 @@
                    'fi;'
                    'sleep 3;'
                    # note: maas-rackd will return 'pool' after start
-                   'sed -i \'s/^pool /server /g\' /etc/ntp/maas.conf;'
+                   'sed -i \'s/^pool ntp.ubuntu.com/server ntp.cesnet.cz/g\' '
+                   '/etc/ntp/maas.conf;'
                    'if [ -x /usr/sbin/ntpdate ]; then'
                    '  ntpdate -s ntp.ubuntu.com;'
                    'else'
diff --git a/tcp_tests/report.py b/tcp_tests/report.py
index 8a2a58e..1bc35a3 100644
--- a/tcp_tests/report.py
+++ b/tcp_tests/report.py
@@ -186,7 +186,7 @@
      test(id,name..)]
     """
     LOG.info("Get results for run - {}".format(run.name))
-    results = t_client.results(run, result_type)
+    results = t_client.results(run)
     results_with_test = []
     if result_type == '5':
         ret = [(run, r) for r in results
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index c5bfd8f..d427b8b 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -109,7 +109,17 @@
   kqueen_enabled: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
-  maas_enabled: 'False'
+  maas_enabled: 'True'
+  maas_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.15
+  maas_deploy_cidr: ==IPV4_NET_ADMIN_PREFIX==.0/24
+  maas_deploy_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
+  maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.250
+  maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.240
+  maas_deploy_vlan: '0'
+  maas_dhcp_enabled: 'False'
+  maas_fabric_name: fabric-0
+  maas_hostname: cfg01
+  maas_manage_deploy_network: 'True'
   mcp_common_scripts_branch: ''
   mcp_version: proposed
   offline_deployment: 'False'
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index bab1394..6f91412 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -365,3 +365,14 @@
   octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
   cinder_backup_engine: 'ceph'
   cinder_ceph_backup_pool_name: 'backups'
+  maas_enabled: 'True'
+  maas_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.15
+  maas_deploy_cidr: ==IPV4_NET_ADMIN_PREFIX==.0/24
+  maas_deploy_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
+  maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.250
+  maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.240
+  maas_deploy_vlan: '0'
+  maas_dhcp_enabled: 'False'
+  maas_fabric_name: fabric-0
+  maas_hostname: cfg01
+  maas_manage_deploy_network: 'True'