Merge branch 'mitaka_dev' into 'master'

Heat+Neutron FIX

See merge request !35

manifests/profile/heat.pp

@@ -83,6 +83,8 @@ class iaas::profile::heat (
 #    region_name => $region,
 #mitaka
     keystone_ec2_uri => "http://${endpoint_main}:5000/v2.0/ec2tokens",
+    keystone_project_domain_id => 'default',
+    keystone_user_domain_id => 'default',
   }
 
   class { '::heat::api':

manifests/profile/neutron/common.pp

@@ -6,6 +6,8 @@ class iaas::profile::neutron::common (
   $service_plugins = $iaas::params::os_neutron_servicepl,
   $external_device2 = $iaas::params::external_device2,
 
+  $memcache = $iaas::params::controller_ips,
+
 ##verbose, debug
   $verbose = $iaas::params::os_verbose,
   $debug = $iaas::params::os_debug,
@@ -44,6 +46,11 @@ class iaas::profile::neutron::common (
     dhcp_agents_per_network => 2
   }
 
+#mitaka, memcache
+  neutron_config {
+    'keystone_authtoken/memcached_servers' :value => join(any2array(suffix($memcache, ':11211')), ',');
+  }
+
   if $external_device2 {
     $network_vlan_ranges='physnet1,physnet2'
   } else {