Merge branch 'dev_resources' into 'dev'

Added resources as neutron_config, glance_api_config and glance_registry_config …

…to prevent related workaround

See merge request !15

manifests/profile/glance.pp

@@ -26,6 +26,10 @@ class iaas::profile::glance (
     debug => $debug,
 ##Identity_uri - planed to be implemented in Kilo
 #    identity_uri => "http://${endpoint}:35357",
+##Identity_uri - workaround in juno
+#    glance_api_config { 'keystone_authtoken/identity_uri' :
+#      value => "http://${endpoint}:35357",
+#    }
     bind_host => $::facts["ipaddress_${admin_interface}"],
     auth_host => $endpoint,
     keystone_password => $password,
@@ -48,6 +52,11 @@ class iaas::profile::glance (
     pipeline => 'keystone',
   }
 
+##Identity_uri - workaround in juno
+  glance_api_config { 'keystone_authtoken/identity_uri' :
+    value => "http://${endpoint}:35357",
+  }
+
   class { '::glance::backend::rbd':
     rbd_store_user => 'glance',
     rbd_store_ceph_conf => '/etc/ceph/ceph.conf',
@@ -60,6 +69,10 @@ class iaas::profile::glance (
     debug => $debug,
 ##Identity_uri - planed to be implemented
 #    identity_uri => "http://${endpoint}:35357",
+##Identity_uri - workaround in juno
+#    glance_registry_config { 'keystone_authtoken/identity_uri' :
+#      value => "http://${endpoint}:35357",
+#    }
     keystone_password => $password,
     database_connection => $iaas::resources::connectors::glance,
     auth_host => $endpoint,
@@ -71,6 +84,11 @@ class iaas::profile::glance (
     bind_host => $::facts["ipaddress_${admin_interface}"],
   }
 
+##Identity_uri - workaround in juno
+  glance_registry_config { 'keystone_authtoken/identity_uri' :
+    value => "http://${endpoint}:35357",
+  }
+
   class { '::glance::notify::rabbitmq':
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,

manifests/profile/neutron/server.pp

@@ -29,6 +29,10 @@ class iaas::profile::neutron::server (
     l3_ha => false,
   }
 
+  neutron_config { 'DEFAULT/allow_automatic_l3agent_failover' :
+    value => "True",
+  }
+
   class { '::neutron::keystone::auth':
     password => $neutron_password,
     public_address => $endpoint,