5 files changed, 54 insertions, 14 deletions
diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp
index 5d25ae2..7a35b6b 100644
--- a/manifests/profile/base/neutron/opendaylight.pp
+++ b/manifests/profile/base/neutron/opendaylight.pp
@@ -28,12 +28,12 @@
 #
 # [*node_name*]
 #   (Optional) The short hostname of node
-#   Defaults to hiera('bootstack_nodeid')
+#   Defaults to hiera('bootstrap_nodeid')
 #
 class tripleo::profile::base::neutron::opendaylight (
   $step         = Integer(hiera('step')),
   $odl_api_ips  = hiera('opendaylight_api_node_ips'),
-  $node_name    = hiera('bootstack_nodeid')
+  $node_name    = hiera('bootstrap_nodeid')
 ) {
 
   if $step >= 1 {
diff --git a/manifests/profile/base/neutron/opendaylight/create_cluster.pp b/manifests/profile/base/neutron/opendaylight/create_cluster.pp
index c3e4f7f..94cd898 100644
--- a/manifests/profile/base/neutron/opendaylight/create_cluster.pp
+++ b/manifests/profile/base/neutron/opendaylight/create_cluster.pp
@@ -28,11 +28,11 @@
 #
 # [*node_name*]
 #   (Optional) The short hostname of node
-#   Defaults to hiera('bootstack_nodeid')
+#   Defaults to hiera('bootstrap_nodeid')
 #
 class tripleo::profile::base::neutron::opendaylight::create_cluster (
   $odl_api_ips  = hiera('opendaylight_api_node_ips'),
-  $node_name    = hiera('bootstack_nodeid')
+  $node_name    = hiera('bootstrap_nodeid')
 ) {
 
   tripleo::profile::base::neutron::opendaylight::configure_cluster {'ODL cluster':
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index c22578c..8a7c4d6 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -34,11 +34,7 @@ class tripleo::profile::base::nova::compute::libvirt (
     $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
     $rbd_persistent_storage = hiera('rbd_persistent_storage', false)
     if $rbd_ephemeral_storage or $rbd_persistent_storage {
-      $client_keys = hiera('ceph::profile::params::client_keys')
-      $client_user = join(['client.', hiera('nova::compute::rbd::libvirt_rbd_user')])
-      class { '::nova::compute::rbd':
-        libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
-      }
+      include ::nova::compute::rbd
     }
 
     if $rbd_ephemeral_storage {
diff --git a/manifests/profile/base/swift/dispersion.pp b/manifests/profile/base/swift/dispersion.pp
new file mode 100644
index 0000000..44af463
--- /dev/null
+++ b/manifests/profile/base/swift/dispersion.pp
@@ -0,0 +1,33 @@
+# Copyright 2017 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::swift::dispersion
+#
+# Swift dispersion profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::swift::dispersion (
+  $step = Integer(hiera('step')),
+) {
+  if $step >= 5 {
+    include ::swift::client
+    include ::swift::dispersion
+  }
+}
diff --git a/manifests/profile/pacemaker/haproxy_bundle.pp b/manifests/profile/pacemaker/haproxy_bundle.pp
index 9c1bdf3..c6eb450 100644
--- a/manifests/profile/pacemaker/haproxy_bundle.pp
+++ b/manifests/profile/pacemaker/haproxy_bundle.pp
@@ -30,6 +30,11 @@
 #   (Optional) Whether load balancing is enabled for this cluster
 #   Defaults to hiera('enable_load_balancer', true)
 #
+# [*deployed_ssl_cert_path*]
+#   (Optional) The filepath of the certificate as it will be stored in
+#   the controller.
+#   Defaults to '/etc/pki/tls/private/overcloud_endpoint.pem'
+#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
@@ -40,11 +45,12 @@
 #   Defaults to hiera('pcs_tries', 20)
 #
 class tripleo::profile::pacemaker::haproxy_bundle (
-  $haproxy_docker_image = hiera('tripleo::profile::pacemaker::haproxy::haproxy_docker_image', undef),
-  $bootstrap_node       = hiera('haproxy_short_bootstrap_node_name'),
-  $enable_load_balancer = hiera('enable_load_balancer', true),
-  $step                 = Integer(hiera('step')),
-  $pcs_tries            = hiera('pcs_tries', 20),
+  $haproxy_docker_image   = hiera('tripleo::profile::pacemaker::haproxy::haproxy_docker_image', undef),
+  $bootstrap_node         = hiera('haproxy_short_bootstrap_node_name'),
+  $enable_load_balancer   = hiera('enable_load_balancer', true),
+  $deployed_ssl_cert_path = '/etc/pki/tls/private/overcloud_endpoint.pem',
+  $step                   = Integer(hiera('step')),
+  $pcs_tries              = hiera('pcs_tries', 20),
 ) {
   include ::tripleo::profile::base::haproxy
 
@@ -137,6 +143,11 @@ class tripleo::profile::pacemaker::haproxy_bundle (
             'target-dir' => '/dev/log',
             'options'    => 'rw',
           },
+          'haproxy-cert'                    => {
+            'source-dir' => deployed_ssl_cert_path,
+            'target-dir' => deployed_ssl_cert_path,
+            'options'    => 'ro',
+          },
         },
       }
       $control_vip = hiera('controller_virtual_ip')