diff options
author | Joe Talerico <jtaleric@redhat.com> | 2017-04-06 07:38:59 -0400 |
---|---|---|
committer | Joe Talerico <jtaleric@redhat.com> | 2017-07-25 17:08:37 +0000 |
commit | c2b2cc555a7d6d447e2e33b7d9f29801eb740b03 (patch) | |
tree | 4b4d1f17749106be7c3ea1fbd3b6de7d0cb3fd33 | |
parent | ec25c792d73c4a4b6e14ddfa0ffa385211fa1a29 (diff) |
Adding Tuned Service
Allow the user to set a specific Tuned profile on a given host.
Defaults to throughput-performance
Change-Id: I0c66193d2733b7a82ad44b1cd0d2187dd732065a
-rw-r--r-- | environments/hyperconverged-ceph.yaml | 1 | ||||
-rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 1 | ||||
-rw-r--r-- | puppet/services/tuned.yaml | 50 | ||||
-rw-r--r-- | releasenotes/notes/tuned-service-650c0eec1cf12a4d.yaml | 4 | ||||
-rw-r--r-- | roles/BlockStorage.yaml | 1 | ||||
-rw-r--r-- | roles/CephStorage.yaml | 1 | ||||
-rw-r--r-- | roles/Compute.yaml | 1 | ||||
-rw-r--r-- | roles/ComputeHCI.yaml | 1 | ||||
-rw-r--r-- | roles/Controller.yaml | 1 | ||||
-rw-r--r-- | roles/ControllerOpenstack.yaml | 1 | ||||
-rw-r--r-- | roles/Database.yaml | 2 | ||||
-rw-r--r-- | roles/IronicConductor.yaml | 1 | ||||
-rw-r--r-- | roles/Messaging.yaml | 1 | ||||
-rw-r--r-- | roles/Networker.yaml | 2 | ||||
-rw-r--r-- | roles/ObjectStorage.yaml | 1 | ||||
-rw-r--r-- | roles/Telemetry.yaml | 2 | ||||
-rw-r--r-- | roles/Undercloud.yaml | 1 | ||||
-rw-r--r-- | roles_data.yaml | 5 | ||||
-rw-r--r-- | roles_data_undercloud.yaml | 1 |
19 files changed, 75 insertions, 3 deletions
diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index 872a1d99..d1970d64 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -26,6 +26,7 @@ parameter_defaults: - OS::TripleO::Services::ComputeNeutronMetadataAgent - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoFirewall + - OS::TripleO::Services::Tuned - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::SensuClient diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index bb458961..2dcc7f00 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -175,6 +175,7 @@ resource_registry: OS::TripleO::Services::Memcached: puppet/services/memcached.yaml OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None + OS::TripleO::Services::Tuned: puppet/services/tuned.yaml OS::TripleO::Services::Securetty: OS::Heat::None OS::TripleO::Services::Sshd: puppet/services/sshd.yaml OS::TripleO::Services::Redis: puppet/services/database/redis.yaml diff --git a/puppet/services/tuned.yaml b/puppet/services/tuned.yaml new file mode 100644 index 00000000..f1dec931 --- /dev/null +++ b/puppet/services/tuned.yaml @@ -0,0 +1,50 @@ +heat_template_version: ocata + +description: > + Configure tuned + +parameters: + ServiceData: + default: {} + description: Dictionary packing service data + type: json + ServiceNetMap: + default: {} + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. This + mapping overrides those in ServiceNetMapDefaults. + type: json + DefaultPasswords: + default: {} + type: json + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + RoleName: + default: '' + description: Role name on which the service is applied + type: string + RoleParameters: + default: {} + description: Parameters specific to the role + type: json + TunedProfileName: + default: '' + description: Tuned Profile to apply to the host + type: string + +outputs: + role_data: + description: Role data for tuned + value: + service_name: tuned + config_settings: + map_replace: + - map_replace: + - tripleo::profile::base::tuned::profile: TunedProfileName + - values: {get_param: RoleParameters} + - values: {'TunedProfileName': {get_param: TunedProfileName}} + step_config: | + include ::tripleo::profile::base::tuned diff --git a/releasenotes/notes/tuned-service-650c0eec1cf12a4d.yaml b/releasenotes/notes/tuned-service-650c0eec1cf12a4d.yaml new file mode 100644 index 00000000..30e72db4 --- /dev/null +++ b/releasenotes/notes/tuned-service-650c0eec1cf12a4d.yaml @@ -0,0 +1,4 @@ +--- +features: + - Allows the user to set the tuned profile on a given + host. Defaults to throughput-performance. diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index 3779d23e..e4fdfa44 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -28,3 +28,4 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index 647c4d5a..f3978c5b 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -25,3 +25,4 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned diff --git a/roles/Compute.yaml b/roles/Compute.yaml index de356487..ec9e3698 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -43,4 +43,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index d20b5f33..a1342dc6 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -43,4 +43,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 34a23b43..c97f7a78 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -126,5 +126,6 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp - OS::TripleO::Services::Zaqar diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 1feb12f0..398736ae 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -101,6 +101,7 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp - OS::TripleO::Services::Zaqar diff --git a/roles/Database.yaml b/roles/Database.yaml index 75b26a8c..e101fd4f 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -22,4 +22,4 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - + - OS::TripleO::Services::Tuned diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index 8a29b337..ae848bc8 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -19,3 +19,4 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index 5b06063f..47e0f920 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -21,4 +21,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 635c430f..311e0a7d 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -36,4 +36,4 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - + - OS::TripleO::Services::Tuned diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index 27dc1233..81bedbd1 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -28,3 +28,4 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index d23ab6e3..b1c73798 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -29,4 +29,4 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages - + - OS::TripleO::Services::Tuned diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index d462fb27..a408a21b 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -43,6 +43,7 @@ - OS::TripleO::Services::SwiftProxy - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage + - OS::TripleO::Services::Tuned - OS::TripleO::Services::UndercloudAodhApi - OS::TripleO::Services::UndercloudAodhEvaluator - OS::TripleO::Services::UndercloudAodhListener diff --git a/roles_data.yaml b/roles_data.yaml index 466164fc..59187183 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -129,6 +129,7 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp - OS::TripleO::Services::Zaqar ############################################################################### @@ -176,6 +177,7 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp ############################################################################### # Role: BlockStorage # @@ -207,6 +209,7 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned ############################################################################### # Role: ObjectStorage # ############################################################################### @@ -237,6 +240,7 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned ############################################################################### # Role: CephStorage # ############################################################################### @@ -264,4 +268,5 @@ - OS::TripleO::Services::Timezone - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoPackages + - OS::TripleO::Services::Tuned diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 2c8e479f..d61d1a2f 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -46,6 +46,7 @@ - OS::TripleO::Services::SwiftProxy - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage + - OS::TripleO::Services::Tuned - OS::TripleO::Services::UndercloudAodhApi - OS::TripleO::Services::UndercloudAodhEvaluator - OS::TripleO::Services::UndercloudAodhListener |