Use Cinder multibackend by default

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller.pp

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 23e8adf..c9af578 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -199,9 +199,7 @@ if hiera('step') >= 2 {
   # TODO: notifications, scrubber, etc.
   include ::glance::api
   include ::glance::registry
-  class { 'glance::backend::swift':
-    swift_store_auth_address => join(['http://', hiera('controller_virtual_ip'), ':5000/v2.0']),
-  }
+  include ::glance::backend::swift
 
   class { 'nova':
     rabbit_hosts           => [hiera('controller_virtual_ip')],
@@ -212,6 +210,7 @@ if hiera('step') >= 2 {
   include ::nova::cert
   include ::nova::conductor
   include ::nova::consoleauth
+  include ::nova::network::neutron
   include ::nova::vncproxy
   include ::nova::scheduler
 
@@ -246,18 +245,38 @@ if hiera('step') >= 2 {
     auth_url => join(['http://', hiera('controller_virtual_ip'), ':35357/v2.0']),
   }
 
+  Service['neutron-server'] -> Service['neutron-dhcp-service']
+  Service['neutron-server'] -> Service['neutron-l3']
+  Service['neutron-server'] -> Service['neutron-ovs-agent-service']
+  Service['neutron-server'] -> Service['neutron-metadata']
+
   class {'cinder':
     rabbit_hosts => [hiera('controller_virtual_ip')],
   }
 
   include ::cinder::api
+  include ::cinder::glance
   include ::cinder::scheduler
   include ::cinder::volume
-  include ::cinder::volume::iscsi
   class {'cinder::setup_test_volume':
     size => join([hiera('cinder_lvm_loop_device_size'), 'M']),
   }
 
+  $cinder_enable_iscsi = hiera('cinder_enable_iscsi_backend', true)
+  if $cinder_enable_iscsi {
+    $cinder_iscsi_backend = 'tripleo_iscsi'
+
+    cinder::backend::iscsi { $cinder_iscsi_backend :
+      iscsi_ip_address => hiera('cinder_iscsi_ip_address'),
+      iscsi_helper     => hiera('cinder_iscsi_helper'),
+    }
+  }
+
+  $cinder_enabled_backends = any2array($cinder_iscsi_backend)
+  class { '::cinder::backends' :
+    enabled_backends => $cinder_enabled_backends,
+  }
+
   # swift proxy
   include ::memcached
   include ::swift::proxy
@@ -312,10 +331,6 @@ if hiera('step') >= 2 {
   include ::heat::api_cloudwatch
   include ::heat::engine
 
-  heat_config {
-    'DEFAULT/instance_user': value => 'heat-admin';
-  }
-
   $snmpd_user = hiera('snmpd_readonly_user_name')
   snmp::snmpv3_user { $snmpd_user:
     authtype => 'MD5',