11 files changed, 54 insertions, 5 deletions
diff --git a/environments/README.md b/environments/README.md
new file mode 100644
index 00000000..4111f7ed
--- /dev/null
+++ b/environments/README.md
@@ -0,0 +1,13 @@
+This directory contains Heat environment file snippets which can
+be used to enable features in the Overcloud.
+
+Configuration
+-------------
+
+These can be enabled using the -e [path to environment yaml] option with
+heatclient.
+
+Below is an example of how to enable the Ceph template using
+devtest\_overcloud.sh:
+
+    export OVERCLOUD\_CUSTOM\_HEAT\_ENV=$TRIPLEO\_ROOT/tripleo-heat-templates/environments/ceph_devel.yaml
diff --git a/environments/puppet-ceph-devel.yaml b/environments/puppet-ceph-devel.yaml
new file mode 100644
index 00000000..d782e8d8
--- /dev/null
+++ b/environments/puppet-ceph-devel.yaml
@@ -0,0 +1,16 @@
+# A Heat environment file which can be used to enable a Ceph
+# storage cluster using the controller and 2 ceph nodes.
+# Rbd backends are enabled for Cinder, Glance, and Nova.
+parameters:
+  CephStorageCount: 2
+  #NOTE: These ID's and keys should be regenerated for
+  # a production deployment. What is here is suitable for
+  # developer and CI testing only.
+  CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
+  CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
+  CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
+  NovaEnableRbdBackend: true
+  CinderEnableRbdBackend: true
+  GlanceBackend: rbd
+  CinderEnableIscsiBackend: false
+  ControllerEnableCephStorage: true
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
new file mode 100644
index 00000000..f235cf8f
--- /dev/null
+++ b/environments/puppet-pacemaker.yaml
@@ -0,0 +1,4 @@
+# An environment which enables configuration of an
+# Overcloud controller with Pacemaker.
+resource_registry:
+  OS::TripleO::ControllerConfig: ../puppet/controller-config-pacemaker.yaml
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index ec7fa7fa..474426c2 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -42,10 +42,6 @@ resources:
             - list_join:
               - "\n"
               - {get_param: ceph_storage_hosts}
-        sysctl:
-          net.ipv4.tcp_keepalive_time: 5
-          net.ipv4.tcp_keepalive_probes: 5
-          net.ipv4.tcp_keepalive_intvl: 1
         hiera:
           datafiles:
             all_nodes:
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index b7fb84ab..c15d43ea 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -12,3 +12,11 @@ nova::network::neutron::neutron_admin_username: 'neutron'
 nova::network::neutron::vif_plugging_is_fatal: false
 nova::network::neutron::vif_plugging_timeout: 30
 nova::network::neutron::dhcp_domain: ''
+
+sysctl_settings:
+  net.ipv4.tcp_keepalive_intvl:
+    value: 1
+  net.ipv4.tcp_keepalive_probes:
+    value: 5
+  net.ipv4.tcp_keepalive_time:
+    value: 5
+\ No newline at end of file
diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index ce2ab3af..b645f9fe 100644
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -24,6 +24,8 @@ if !str2bool(hiera('enable_package_install', 'false')) {
   }
 }
 
+create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index ffa55cdb..caca89a8 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -24,6 +24,8 @@ if !str2bool(hiera('enable_package_install', 'false')) {
   }
 }
 
+create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index a11df054..27272643 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -26,6 +26,8 @@ if !str2bool(hiera('enable_package_install', 'false')) {
 
 if hiera('step') >= 1 {
 
+  create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
   $controller_node_ips = split(hiera('controller_node_ips'), ',')
 
   class { '::tripleo::loadbalancer' :
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index ecd5db5f..ac04e53e 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -47,6 +47,8 @@ $non_pcmk_start = hiera('step') >= 4 or (hiera('step') >= 3 and $pacemaker_maste
 
 if hiera('step') >= 1 {
 
+  create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
   if count(hiera('ntp::servers')) > 0 {
     include ::ntp
   }
@@ -60,7 +62,7 @@ if hiera('step') >= 1 {
     haproxy_service_manage => false,
   }
 
-  $pacemaker_cluster_members = regsubst(hiera('controller_node_ips'), ',', ' ', 'G')
+  $pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
   user { 'hacluster':
    ensure => present,
   } ->
diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp
index 8d0ad783..24799c8c 100644
--- a/puppet/manifests/overcloud_object.pp
+++ b/puppet/manifests/overcloud_object.pp
@@ -24,6 +24,8 @@ if !str2bool(hiera('enable_package_install', 'false')) {
   }
 }
 
+create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
diff --git a/puppet/manifests/overcloud_volume.pp b/puppet/manifests/overcloud_volume.pp
index 3d7cb490..80cf6a21 100644
--- a/puppet/manifests/overcloud_volume.pp
+++ b/puppet/manifests/overcloud_volume.pp
@@ -24,6 +24,8 @@ if str2bool(hiera('disable_package_install', 'false')) {
   }
 }
 
+create_resources(sysctl::value, hiera('sysctl_settings'), {})
+
 if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }