diff options
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/glance/api.pp | 13 | ||||
| -rw-r--r-- | manifests/profile/base/glance/registry.pp | 13 | ||||
| -rw-r--r-- | manifests/profile/base/keystone.pp | 18 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/dhcp.pp | 21 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/l3.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/metadata.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/ovs.pp | 15 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/server.pp | 12 | ||||
| -rw-r--r-- | manifests/profile/base/rabbitmq.pp | 91 |
9 files changed, 105 insertions, 108 deletions
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index 22b4dc9..ad59a38 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -18,14 +18,6 @@ # # === Parameters # -# [*manage_service*] -# (Optional) Whether to manage the glance service -# Defaults to undef -# -# [*enabled*] -# (Optional) Whether to enable the glance service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -36,8 +28,6 @@ # Defaults to downcase(hiera('glance_backend', 'swift')) # class tripleo::profile::base::glance::api ( - $manage_service = undef, - $enabled = undef, $step = hiera('step'), $glance_backend = downcase(hiera('glance_backend', 'swift')), ) { @@ -57,12 +47,9 @@ class tripleo::profile::base::glance::api ( include ::glance::config class { '::glance::api': known_stores => $glance_store, - manage_service => $manage_service, - enabled => $enabled, } include ::glance::notify::rabbitmq include join(['::glance::backend::', $glance_backend]) } } - diff --git a/manifests/profile/base/glance/registry.pp b/manifests/profile/base/glance/registry.pp index b77b356..774f646 100644 --- a/manifests/profile/base/glance/registry.pp +++ b/manifests/profile/base/glance/registry.pp @@ -22,14 +22,6 @@ # (Optional) Whether to run db sync # Defaults to true # -# [*manage_service*] -# (Optional) Whether to manage the glance service -# Defaults to undef -# -# [*enabled*] -# (Optional) Whether to enable the glance service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -41,8 +33,6 @@ # class tripleo::profile::base::glance::registry ( $sync_db = true, - $manage_service = undef, - $enabled = undef, $step = hiera('step'), $glance_backend = downcase(hiera('glance_backend', 'swift')), ) { @@ -57,12 +47,9 @@ class tripleo::profile::base::glance::registry ( include ::glance::config class { '::glance::registry' : sync_db => $sync_db, - manage_service => $manage_service, - enabled => $enabled, } include ::glance::notify::rabbitmq include join(['::glance::backend::', $glance_backend]) } } - diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index 2f7a27a..a5060b8 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -22,14 +22,6 @@ # (Optional) Whether to run db sync # Defaults to true # -# [*manage_service*] -# (Optional) Whether to manage the keystone service -# Defaults to undef -# -# [*enabled*] -# (Optional) Whether to enable the keystone service -# Defaults to undef -# # [*bootstrap_master*] # (Optional) The hostname of the node responsible for bootstrapping # Defaults to hiera('bootstrap_nodeid') @@ -53,8 +45,6 @@ # class tripleo::profile::base::keystone ( $sync_db = true, - $manage_service = undef, - $enabled = undef, $bootstrap_master = undef, $manage_roles = true, $manage_endpoint = true, @@ -69,8 +59,6 @@ class tripleo::profile::base::keystone ( if $step >= 4 or ( $step >= 3 and $sync_db ) { class { '::keystone': sync_db => $sync_db, - manage_service => $manage_service, - enabled => $enabled, enable_bootstrap => $bootstrap_master, } @@ -96,21 +84,21 @@ class tripleo::profile::base::keystone ( content => hiera('keystone_signing_certificate'), owner => 'keystone', group => 'keystone', - notify => Service['keystone'], + notify => Service[$::apache::params::service_name], require => File['/etc/keystone/ssl/certs'], } file { '/etc/keystone/ssl/private/signing_key.pem': content => hiera('keystone_signing_key'), owner => 'keystone', group => 'keystone', - notify => Service['keystone'], + notify => Service[$::apache::params::service_name], require => File['/etc/keystone/ssl/private'], } file { '/etc/keystone/ssl/certs/ca.pem': content => hiera('keystone_ca_certificate'), owner => 'keystone', group => 'keystone', - notify => Service['keystone'], + notify => Service[$::apache::params::service_name], require => File['/etc/keystone/ssl/certs'], } } diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp index 1d7cc10..180fd37 100644 --- a/manifests/profile/base/neutron/dhcp.pp +++ b/manifests/profile/base/neutron/dhcp.pp @@ -22,14 +22,6 @@ # (Optional) # Defaults to hiera('neutron_dnsmasq_options') # -# [*enabled*] -# (Optional) Whether to enable the Neutron DHCP Agent service -# Defaults to undef -# -# [*manage_service*] -# (Optional) Whether to manage the Neutron DHCP Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -37,15 +29,18 @@ # class tripleo::profile::base::neutron::dhcp ( $neutron_dnsmasq_options = hiera('neutron_dnsmasq_options', ''), - $enabled = undef, - $manage_service = undef, $step = hiera('step'), ) { if $step >= 4 { include ::tripleo::profile::base::neutron - class { '::neutron::agents::dhcp': - manage_service => $manage_service, - enabled => $enabled + include ::neutron::agents::dhcp + + file { '/etc/neutron/dnsmasq-neutron.conf': + content => $neutron_dnsmasq_options, + owner => 'neutron', + group => 'neutron', + notify => Service['neutron-dhcp-service'], + require => Package['neutron'], } Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-dhcp' |> diff --git a/manifests/profile/base/neutron/l3.pp b/manifests/profile/base/neutron/l3.pp index f96833a..2b57555 100644 --- a/manifests/profile/base/neutron/l3.pp +++ b/manifests/profile/base/neutron/l3.pp @@ -22,30 +22,17 @@ # (Optional) Whether to set ovs_use_veth (for older kernel support) # Defaults to hiera('neutron_ovs_use_veth', false) # -# [*enabled*] -# (Optional) Whether to enable the Neutron L3 Agent service -# Defaults to undef -# -# [*manage_service*] -# (Optional) Whether to manage the Neutron L3 Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::base::neutron::l3 ( - $enabled = undef, - $manage_service = undef, $step = hiera('step'), ) { if $step >= 4 { include ::tripleo::profile::base::neutron - class { '::neutron::agents::l3': - manage_service => $manage_service, - enabled => $enabled - } + include ::neutron::agents::l3 Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-l3' |> } diff --git a/manifests/profile/base/neutron/metadata.pp b/manifests/profile/base/neutron/metadata.pp index bdad751..d7b4c99 100644 --- a/manifests/profile/base/neutron/metadata.pp +++ b/manifests/profile/base/neutron/metadata.pp @@ -18,30 +18,17 @@ # # === Parameters # -# [*enabled*] -# (Optional) Whether to enable the Neutron Metadata Agent service -# Defaults to undef -# -# [*manage_service*] -# (Optional) Whether to manage the Neutron Metadata Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::base::neutron::metadata ( - $enabled = undef, - $manage_service = undef, $step = hiera('step'), ) { if $step >= 4 { include ::tripleo::profile::base::neutron - class { '::neutron::agents::metadata': - manage_service => $manage_service, - enabled => $enabled - } + include ::neutron::agents::metadata Service<| title == 'neutron-server' |> -> Service<| title == 'neutron-metadata' |> } diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp index 783952b..f801511 100644 --- a/manifests/profile/base/neutron/ovs.pp +++ b/manifests/profile/base/neutron/ovs.pp @@ -18,32 +18,19 @@ # # === Parameters # -# [*manage_service*] -# (Optional) Whether to manage the Neutron OVS Agent service -# Defaults to undef -# -# [*enabled*] -# (Optional) Whether to enable the Neutron OVS Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::base::neutron::ovs( - $manage_service = undef, - $enabled = undef, $step = hiera('step'), ) { include ::tripleo::profile::base::neutron if $step >= 4 { - class { '::neutron::agents::ml2::ovs': - manage_service => $manage_service, - enabled => $enabled - } + include ::neutron::agents::ml2::ovs # Optional since manage_service may be false and neutron server may not be colocated. Service<| title == 'neutron-server' |> -> Service<| title == 'neutron-ovs-agent-service' |> diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp index 20127ed..14af56e 100644 --- a/manifests/profile/base/neutron/server.pp +++ b/manifests/profile/base/neutron/server.pp @@ -22,14 +22,6 @@ # (Optional) Whether to run Neutron DB sync operations # Defaults to undef # -# [*manage_service*] -# (Optional) Whether to manage the Neutron Server service -# Defaults to undef -# -# [*enabled*] -# (Optional) Whether to enable the Neutron Server service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -37,8 +29,6 @@ # class tripleo::profile::base::neutron::server ( $sync_db = true, - $manage_service = undef, - $enabled = undef, $step = hiera('step'), ) { @@ -53,8 +43,6 @@ class tripleo::profile::base::neutron::server ( class { '::neutron::server': sync_db => $sync_db, - manage_service => $manage_service, - enabled => $enabled } } } diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp new file mode 100644 index 0000000..e67d71a --- /dev/null +++ b/manifests/profile/base/rabbitmq.pp @@ -0,0 +1,91 @@ +# Copyright 2016 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::rabbitmq +# +# RabbitMQ profile for tripleo +# +# === Parameters +# +# [*nodes*] +# (Optional) Array of host(s) for RabbitMQ nodes. +# Defaults to hiera('rabbit_node_ips', []). +# +# [*ipv6*] +# (Optional) Whether to deploy RabbitMQ on IPv6 network. +# Defaults to str2bool(hiera('rabbit_ipv6', false)). +# +# [*environment*] +# (Optional) RabbitMQ environment. +# Defaults to hiera('rabbitmq_environment'). +# +# [*kernel_variables*] +# (Optional) RabbitMQ environment. +# Defaults to hiera('rabbitmq_environment'). +# +# [*config_variables*] +# (Optional) RabbitMQ environment. +# Defaults to hiera('rabbitmq_config_variables'). +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::rabbitmq ( + $nodes = hiera('rabbit_node_ips', []), + $ipv6 = str2bool(hiera('rabbit_ipv6', false)), + $environment = hiera('rabbitmq_environment'), + $kernel_variables = hiera('rabbitmq_kernel_variables'), + $config_variables = hiera('rabbitmq_config_variables'), + $step = hiera('step'), +) { + + # IPv6 environment, necessary for RabbitMQ. + if $ipv6 { + $rabbit_env = merge($environment, { + 'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"' + }) + } else { + $rabbit_env = $environment + } + + $manage_service = hiera('rabbitmq::service_manage', true) + if $step >= 1 { + # Specific configuration for multi-nodes or when running with Pacemaker. + if count($nodes) > 1 or ! $manage_service { + class { '::rabbitmq': + config_cluster => $manage_service, + cluster_nodes => $nodes, + tcp_keepalive => false, + config_kernel_variables => $kernel_variables, + config_variables => $config_variables, + environment_variables => $rabbit_env, + } + # when running multi-nodes without Pacemaker + if $manage_service { + rabbitmq_policy { 'ha-all@/': + pattern => '^(?!amq\.).*', + definition => { + 'ha-mode' => 'all', + }, + } + } + } else { + # Standard configuration + include ::rabbitmq + } + } + +} |