9 files changed, 58 insertions, 13 deletions
diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp
index 4d7eb89..e69bbd5 100644
--- a/manifests/profile/base/gnocchi/metricd.pp
+++ b/manifests/profile/base/gnocchi/metricd.pp
@@ -28,7 +28,9 @@ class tripleo::profile::base::gnocchi::metricd (
 ) {
   include ::tripleo::profile::base::gnocchi
 
-  if $step >= 4 {
+  if $step >= 5 {
     include ::gnocchi::metricd
+    Keystone_endpoint<||> -> Service['gnocchi-metricd']
+    Keystone_user_role<||> -> Service['gnocchi-metricd']
   }
 }
diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp
index 775b043..1fe4067 100644
--- a/manifests/profile/base/gnocchi/statsd.pp
+++ b/manifests/profile/base/gnocchi/statsd.pp
@@ -28,7 +28,9 @@ class tripleo::profile::base::gnocchi::statsd (
 ) {
   include ::tripleo::profile::base::gnocchi
 
-  if $step >= 4 {
+  if $step >= 5 {
     include ::gnocchi::statsd
+    Keystone_endpoint<||> -> Service['gnocchi-statsd']
+    Keystone_user_role<||> -> Service['gnocchi-statsd']
   }
 }
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp
index 68de12b..7166298 100644
--- a/manifests/profile/base/heat/api.pp
+++ b/manifests/profile/base/heat/api.pp
@@ -26,8 +26,9 @@
 class tripleo::profile::base::heat::api (
   $step = hiera('step'),
 ) {
+  include ::tripleo::profile::base::heat
+
   if $step >= 4 {
-    include ::tripleo::profile::base::heat
     include ::heat::api
   }
 }
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp
index 7c80fc6..c1adae6 100644
--- a/manifests/profile/base/heat/api_cfn.pp
+++ b/manifests/profile/base/heat/api_cfn.pp
@@ -26,8 +26,9 @@
 class tripleo::profile::base::heat::api_cfn (
   $step = hiera('step'),
 ) {
+  include ::tripleo::profile::base::heat
+
   if $step >= 4 {
-    include ::tripleo::profile::base::heat
     include ::heat::api_cfn
   }
 }
diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp
index 6362275..3004db9 100644
--- a/manifests/profile/base/heat/api_cloudwatch.pp
+++ b/manifests/profile/base/heat/api_cloudwatch.pp
@@ -26,8 +26,9 @@
 class tripleo::profile::base::heat::api_cloudwatch (
   $step = hiera('step'),
 ) {
+  include ::tripleo::profile::base::heat
+
   if $step >= 4 {
-    include ::tripleo::profile::base::heat
     include ::heat::api_cloudwatch
   }
 }
diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp
index 32a711f..112fad8 100644
--- a/manifests/profile/base/heat/engine.pp
+++ b/manifests/profile/base/heat/engine.pp
@@ -37,12 +37,13 @@ class tripleo::profile::base::heat::engine (
     $sync_db = false
   }
 
+  include ::tripleo::profile::base::heat
+
   if $step >= 3 and $sync_db {
     include ::heat::db::mysql
   }
 
   if $step >= 4 or ( $step >= 3 and $sync_db ) {
-    include ::tripleo::profile::base::heat
     include ::heat::engine
   }
 
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
index 2cb61fb..4824648 100644
--- a/manifests/profile/base/ironic/conductor.pp
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -22,15 +22,27 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
+# [*manage_pxe*]
+#   (Optional) Whether to manage the PXE/iPXE environment for the conductor.
+#   Defaults to true
+#
 class tripleo::profile::base::ironic::conductor (
   $step = hiera('step'),
+  $manage_pxe = true,
 ) {
   include ::tripleo::profile::base::ironic
 
   if $step >= 4 {
-      include ::ironic::drivers::deploy
-      include ::ironic::drivers::ipmi
-      include ::ironic::drivers::pxe
       include ::ironic::conductor
+      include ::ironic::drivers::pxe
+      if $manage_pxe {
+          include ::ironic::pxe
+      }
+
+      # Configure a few popular drivers
+      include ::ironic::drivers::drac
+      include ::ironic::drivers::ilo
+      include ::ironic::drivers::ipmi
+      include ::ironic::drivers::ssh
   }
 }
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 13ef700..fd38869 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -87,6 +87,9 @@ class tripleo::profile::base::keystone (
     if hiera('ceilometer_api_enabled', false) {
       include ::ceilometer::keystone::auth
     }
+    if hiera('ceph_rgw_enabled', false) {
+      include ::ceph::rgw::keystone::auth
+    }
     if hiera('cinder_api_enabled', false) {
       include ::cinder::keystone::auth
     }
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index e0f67cd..98a09a0 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -26,7 +26,8 @@
 #   Defaults to true
 #
 #  [*devices*]
-#   (Optional) The swift devices
+#   (Optional) DEPRECATED The swift devices
+#   Should pass raw_disk_prefix, raw_disks and swift_storage_node_ips instead
 #   Defaults to ''
 #
 #  [*step*]
@@ -38,12 +39,30 @@
 #   (Optional) The swift zones
 #   Defaults to 1
 #
+#  [*raw_disk_prefix*]
+#   (Optional) Disk prefix used to create devices list
+#   Defaults to 'r1z1-'
+#
+#  [*raw_disks*]
+#   (Optional) list of raw disks in format
+#   [':%PORT%/device1', ':%PORT%/device2']
+#   Combined with raw_disk_prefix and swift_storage_node_ips
+#   to create devices list
+#   Defaults to an empty list
+#
+#  [*swift_storage_node_ips*]
+#  (Optional) list of ip addresses for nodes running swift_storage service
+#  Defaults to hiera('swift_storage_node_ips') or an empty list
+#
 class tripleo::profile::base::swift::ringbuilder (
   $replicas,
   $build_ring  = true,
-  $devices     = '',
+  $devices     = undef,
   $step        = hiera('step'),
   $swift_zones = '1',
+  $raw_disk_prefix = 'r1z1-',
+  $raw_disks = [],
+  $swift_storage_node_ips = hiera('swift_storage_node_ips', []),
 ) {
   if $step >= 2 {
     # pre-install swift here so we can build rings
@@ -54,8 +73,11 @@ class tripleo::profile::base::swift::ringbuilder (
     validate_bool($build_ring)
 
     if $build_ring {
-
-      $device_array = strip(split(rstrip($devices), ','))
+      if $devices {
+        $device_array = strip(split(rstrip($devices), ','))
+      } else {
+        $device_array = tripleo_swift_devices($raw_disk_prefix, $swift_storage_node_ips, $raw_disks)
+      }
 
       # create local rings
       swift::ringbuilder::create{ ['object', 'account', 'container']: