Merge "Add a default setting for BondInterfaceOvsOptions"

diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml
new file mode 100644 (file)
index 0000000..535ec6f
--- /dev/null
+++ b/environments/storage-environment.yaml
@@ -0,0 +1,57 @@
+## A Heat environment file which can be used to set up storage
+## backends. Defaults to Ceph used as a backend for Cinder, Glance and
+## Nova ephemeral storage.
+parameters:
+
+  #### BACKEND SELECTION ####
+
+  ## Whether to enable iscsi backend for Cinder.
+  CinderEnableIscsiBackend: false
+  ## Whether to enable rbd (Ceph) backend for Cinder.
+  CinderEnableRbdBackend: true
+  ## Whether to enable NFS backend for Cinder.
+  # CinderEnableNfsBackend: false
+  ## Whether to enable rbd (Ceph) backend for Nova ephemeral storage.
+  NovaEnableRbdBackend: true
+  ## Glance backend can be either 'rbd' (Ceph), 'swift' or 'file'.
+  GlanceBackend: rbd
+
+
+  #### CINDER NFS SETTINGS ####
+
+  ## NFS mount options
+  # CinderNfsMountOptions: ''
+  ## NFS mount point, e.g. '192.168.122.1:/export/cinder'
+  # CinderNfsServers: ''
+
+
+  #### GLANCE FILE BACKEND PACEMAKER SETTINGS (used for mounting NFS) ####
+
+  ## Whether to make Glance 'file' backend a mount managed by Pacemaker
+  # GlanceFilePcmkManage: false
+  ## File system type of the mount
+  # GlanceFilePcmkFstype: nfs
+  ## Pacemaker mount point, e.g. '192.168.122.1:/export/glance' for NFS
+  # GlanceFilePcmkDevice: ''
+  ## Options for the mount managed by Pacemaker
+  # GlanceFilePcmkOptions: ''
+
+
+  #### CEPH SETTINGS ####
+
+  ## Whether to deploy Ceph OSDs on the controller nodes. By default
+  ## OSDs are deployed on dedicated ceph-storage nodes only.
+  # ControllerEnableCephStorage: false
+
+  ## When deploying Ceph through the oscplugin CLI, the following
+  ## parameters are set automatically by the CLI. When deploying via
+  ## heat stack-create, they need to be provided manually.
+
+  ## Number of Ceph storage nodes to deploy
+  # CephStorageCount: 0
+  ## Ceph FSID, e.g. '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
+  # CephClusterFSID: ''
+  ## Ceph monitor key, e.g. 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
+  # CephMonKey: ''
+  ## Ceph admin key, e.g. 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
+  # CephAdminKey: ''

diff --git a/extraconfig/post_deploy/rhel-registration/scripts/rhel-registration b/extraconfig/post_deploy/rhel-registration/scripts/rhel-registration
index c2bf189..cbbd6a1 100644 (file)
--- a/extraconfig/post_deploy/rhel-registration/scripts/rhel-registration
+++ b/extraconfig/post_deploy/rhel-registration/scripts/rhel-registration
@@ -94,7 +94,7 @@ fi
 case "${REG_METHOD:-}" in
     portal)
         subscription-manager register $opts
-        if [ -z "${REG_AUTO_ATTACH:-}" ]; then
+        if [ -z "${REG_AUTO_ATTACH:-}" -a -z "${REG_ACTIVATION_KEY:-}" ]; then
             subscription-manager attach $attach_opts
         fi
         subscription-manager $repos

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 272a668..ab88a69 100644 (file)
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -27,3 +27,9 @@ sysctl_settings:
     value: 5
   net.ipv4.tcp_keepalive_time:
     value: 5
+
+nova::rabbit_heartbeat_timeout_threshold: 60
+neutron::rabbit_heartbeat_timeout_threshold: 60
+cinder::rabbit_heartbeat_timeout_threshold: 60
+ceilometer::rabbit_heartbeat_timeout_threshold: 60
+heat::rabbit_heartbeat_timeout_threshold: 60

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 2571970..1ae076d 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -40,6 +40,9 @@ swift::proxy::authtoken::admin_tenant_name: 'service'
 ceilometer::api::keystone_tenant: 'service'
 heat::keystone_tenant: 'service'
 
+# keystone
+keystone::cron::token_flush::maxdelay: 3600
+
 #swift
 swift::proxy::pipeline:
   - 'catch_errors'

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 09edef5..f8ffb8f 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -486,3 +486,7 @@ if hiera('step') >= 3 {
   hiera_include('controller_classes')
 
 } #END STEP 3
+
+if hiera('step') >= 4 {
+  include ::keystone::cron::token_flush
+} #END STEP 4

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a3eb6e5..8303245 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -902,6 +902,8 @@ if hiera('step') >= 3 {
 } #END STEP 3
 
 if hiera('step') >= 4 {
+  include ::keystone::cron::token_flush
+
   if $pacemaker_master {
 
     # Keystone