Add kernel service

Add a new service that will load and configure kernel modules.

Depends-On: If4f1047ff8c193a14b821d8b826f637872cf62bd
Change-Id: I8f771712595d0f4826858b855985f65d3621c3f1
This commit is contained in:
Emilien Macchi 2016-07-04 15:04:18 -04:00
parent 519b94ff1e
commit 631b30dd3a
9 changed files with 24 additions and 38 deletions

View File

@ -140,6 +140,7 @@ resource_registry:
OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml
OS::TripleO::Services::IronicApi: puppet/services/ironic-api.yaml
OS::TripleO::Services::IronicConductor: puppet/services/ironic-conductor.yaml
OS::TripleO::Services::Kernel: puppet/services/kernel.yaml
OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml
OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml
OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.yaml

View File

@ -504,6 +504,7 @@ parameters:
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
@ -547,6 +548,7 @@ parameters:
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::NovaCompute
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::Kernel
description: A list of service resources (configured in the Heat
resource_registry) which represent nested stacks
for each service that should get installed on the Compute Nodes.
@ -578,6 +580,7 @@ parameters:
BlockStorageServices:
default:
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timezone
description: A list of service resources (configured in the Heat
@ -610,6 +613,7 @@ parameters:
default: {}
ObjectStorageServices:
default:
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::SwiftStorage
- OS::TripleO::Services::Snmp
@ -647,6 +651,7 @@ parameters:
CephStorageServices:
default:
- OS::TripleO::Services::CephOSD
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timezone
description: A list of service resources (configured in the Heat

View File

@ -16,14 +16,6 @@
include ::tripleo::packages
include ::tripleo::firewall
if hiera('step') >= 1 {
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
}
if hiera('step') >= 4 {
hiera_include('ceph_classes')
}

View File

@ -16,10 +16,6 @@
include ::tripleo::packages
include ::tripleo::firewall
create_resources(kmod::load, hiera('kernel_modules'), { })
create_resources(sysctl::value, hiera('sysctl_settings'), { })
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
if hiera('step') >= 4 {
# When utilising images for deployment, we need to reset the iSCSI initiator name to make it unique

View File

@ -18,14 +18,6 @@ include ::tripleo::firewall
$enable_load_balancer = hiera('enable_load_balancer', true)
if hiera('step') >= 1 {
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
}
if hiera('step') >= 2 {
# MongoDB

View File

@ -53,10 +53,6 @@ $non_pcmk_start = hiera('step') >= 5
if hiera('step') >= 1 {
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
$pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
$corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
if $corosync_ipv6 {

View File

@ -16,12 +16,6 @@
include ::tripleo::packages
include ::tripleo::firewall
if hiera('step') >= 1 {
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
}
if hiera('step') >= 4 {
hiera_include('object_classes')
}

View File

@ -16,14 +16,6 @@
include ::tripleo::packages
include ::tripleo::firewall
if hiera('step') >= 1 {
create_resources(kmod::load, hiera('kernel_modules'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})
Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
}
if hiera('step') >= 4 {
include ::cinder

View File

@ -0,0 +1,18 @@
heat_template_version: 2016-04-08
description: >
Load kernel modules with kmod and configure kernel options with sysctl.
parameters:
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
outputs:
role_data:
description: Role data for the Kernel modules
value:
step_config: |
include ::tripleo::profile::base::kernel