Merge branch 'mitaka_dev' into 'master'

[Fix] Introduced zabbix_server_ip variable to make Server monitored by itself

See merge request !36

manifests/role/monit_server.pp

 class iaas::role::monit_server(
+     $zabbix_server_ip = undef,
      $database_password  = undef,
      $admin_interface	 = $iaas::params::admin_interface,
      $zabbix_version     = '2.4',
@@ -14,10 +15,10 @@ class iaas::role::monit_server(
      zabbix_server 	=> 'localhost',
      zabbix_web 	=> 'localhost',
      zabbix_timezone 	=> 'Europe/Rome',
-     zabbix_server_ip 	=> '127.0.0.1',
+     zabbix_server_ip 	=> $zabbix_server_ip,
      admin_interface    => $admin_interface,
      zabbix_version     => $zabbix_version, 
      zabbix_key         => $zabbix_key, 
      zabbix_key_source  => $zabbix_key_source, 
    }
-}
\ No newline at end of file
+}