diff options
| -rw-r--r-- | lib/facter/alt_fqdns.rb | 17 | ||||
| -rw-r--r-- | manifests/profile/base/aodh.pp | 10 | ||||
| -rw-r--r-- | manifests/profile/base/ceilometer.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/base/cinder.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/base/glance/api.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/base/heat.pp | 6 | ||||
| -rw-r--r-- | manifests/profile/base/ironic.pp | 8 | ||||
| -rw-r--r-- | manifests/profile/base/ironic/conductor.pp | 18 | ||||
| -rw-r--r-- | manifests/profile/base/keystone.pp | 6 | ||||
| -rw-r--r-- | manifests/profile/base/logging/fluentd.pp | 180 | ||||
| -rw-r--r-- | manifests/profile/base/manila/api.pp | 11 | ||||
| -rw-r--r-- | manifests/profile/base/neutron.pp | 11 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/opencontrail/vrouter.pp (renamed from manifests/profile/base/monitoring/fluentd.pp) | 27 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/plumgrid.pp | 45 | ||||
| -rw-r--r-- | manifests/profile/base/nova.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/base/sahara.pp | 8 | ||||
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 15 |
17 files changed, 367 insertions, 31 deletions
diff --git a/lib/facter/alt_fqdns.rb b/lib/facter/alt_fqdns.rb index 8a4d59b..216beef 100644 --- a/lib/facter/alt_fqdns.rb +++ b/lib/facter/alt_fqdns.rb @@ -14,9 +14,9 @@ # under the License. [ 'external', - 'internalapi', + 'internal_api', 'storage', - 'storagemgmt', + 'storage_mgmt', 'tenant', 'management', ].each do |network| @@ -24,10 +24,21 @@ setcode do external_hostname_parts = [ Facter.value(:hostname), - network, + network.gsub('_', ''), Facter.value(:domain), ].reject { |part| part.nil? || part.empty? } external_hostname_parts.join(".") end end end +# map ctlplane network to management fqdn +Facter.add('fqdn_ctlplane') do + setcode do + hostname_parts = [ + Facter.value(:hostname), + 'management', + Facter.value(:domain), + ].reject { |part| part.nil? || part.empty? } + hostname_parts.join(".") + end +end diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp index 07c0a88..2fad5b3 100644 --- a/manifests/profile/base/aodh.pp +++ b/manifests/profile/base/aodh.pp @@ -27,9 +27,15 @@ # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') +# + class tripleo::profile::base::aodh ( $step = hiera('step'), $bootstrap_node = hiera('bootstrap_nodeid', undef), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $::hostname == downcase($bootstrap_node) { @@ -43,7 +49,9 @@ class tripleo::profile::base::aodh ( } if $step >= 4 or ($step >= 3 and $sync_db) { - include ::aodh + class { '::aodh' : + rabbit_hosts => $rabbit_hosts, + } include ::aodh::auth include ::aodh::config include ::aodh::client diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp index 88818de..aaf904f 100644 --- a/manifests/profile/base/ceilometer.pp +++ b/manifests/profile/base/ceilometer.pp @@ -23,12 +23,19 @@ # for more details. # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::ceilometer ( $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $step >= 3 { - include ::ceilometer + class { '::ceilometer' : + rabbit_hosts => $rabbit_hosts, + } include ::ceilometer::config } diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp index 43d95b4..510ea40 100644 --- a/manifests/profile/base/cinder.pp +++ b/manifests/profile/base/cinder.pp @@ -30,10 +30,15 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::cinder ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $cinder_enable_db_purge = true, $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -42,7 +47,9 @@ class tripleo::profile::base::cinder ( } if $step >= 4 or ($step >= 3 and $sync_db) { - include ::cinder + class { '::cinder' : + rabbit_hosts => $rabbit_hosts, + } include ::cinder::config } diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index 845fd41..ecffd7f 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -27,9 +27,14 @@ # for more details. # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::glance::api ( $glance_backend = downcase(hiera('glance_backend', 'swift')), $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $step >= 4 { @@ -48,7 +53,9 @@ class tripleo::profile::base::glance::api ( class { '::glance::api': stores => $glance_store, } - include ::glance::notify::rabbitmq + class { '::glance::notify::rabbitmq' : + rabbit_hosts => $rabbit_hosts, + } include join(['::glance::backend::', $glance_backend]) } diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index cafe95e..027ab7e 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -35,11 +35,16 @@ # for more details. # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::heat ( $bootstrap_node = downcase(hiera('bootstrap_nodeid')), $manage_db_purge = hiera('heat_enable_db_purge', true), $notification_driver = 'messaging', $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { # Domain resources will be created at step5 on the bootstrap_node so we # configure heat.conf at step3 and 4 but actually create the domain later. @@ -54,6 +59,7 @@ class tripleo::profile::base::heat ( if $step >= 4 { class { '::heat' : notification_driver => $notification_driver, + rabbit_hosts => $rabbit_hosts, } include ::heat::config include ::heat::cors diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp index da89839..6c0769a 100644 --- a/manifests/profile/base/ironic.pp +++ b/manifests/profile/base/ironic.pp @@ -26,9 +26,14 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::ironic ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { # Database is accessed by both API and conductor, hence it's here. if $::hostname == downcase($bootstrap_node) { @@ -43,7 +48,8 @@ class tripleo::profile::base::ironic ( if $step >= 4 or ($step >= 3 and $sync_db) { class { '::ironic': - sync_db => $sync_db, + sync_db => $sync_db, + rabbit_hosts => $rabbit_hosts, } include ::ironic::cors diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp index 2cb61fb..4824648 100644 --- a/manifests/profile/base/ironic/conductor.pp +++ b/manifests/profile/base/ironic/conductor.pp @@ -22,15 +22,27 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # +# [*manage_pxe*] +# (Optional) Whether to manage the PXE/iPXE environment for the conductor. +# Defaults to true +# class tripleo::profile::base::ironic::conductor ( $step = hiera('step'), + $manage_pxe = true, ) { include ::tripleo::profile::base::ironic if $step >= 4 { - include ::ironic::drivers::deploy - include ::ironic::drivers::ipmi - include ::ironic::drivers::pxe include ::ironic::conductor + include ::ironic::drivers::pxe + if $manage_pxe { + include ::ironic::pxe + } + + # Configure a few popular drivers + include ::ironic::drivers::drac + include ::ironic::drivers::ilo + include ::ironic::drivers::ipmi + include ::ironic::drivers::ssh } } diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index 354d24c..13ef700 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -31,10 +31,15 @@ # for more details. # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::keystone ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $manage_db_purge = hiera('keystone_enable_db_purge', true), $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -54,6 +59,7 @@ class tripleo::profile::base::keystone ( class { '::keystone': sync_db => $sync_db, enable_bootstrap => $sync_db, + rabbit_hosts => $rabbit_hosts, } include ::keystone::config diff --git a/manifests/profile/base/logging/fluentd.pp b/manifests/profile/base/logging/fluentd.pp new file mode 100644 index 0000000..3ed7d88 --- /dev/null +++ b/manifests/profile/base/logging/fluentd.pp @@ -0,0 +1,180 @@ +# 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::logging::fluentd +# +# FluentD configuration for TripleO +# +# === Parameters +# +# [*step*] +# (Optional) String. The current step of the deployment +# Defaults to hiera('step') +# +# [*fluentd_sources*] +# (Optional) List of dictionaries. A list of sources for fluentd. +# +# [*fluentd_filters*] +# (Optional) List of dictionaries. A list of filters for fluentd. +# +# [*fluentd_servers*] +# (Optional) List of dictionaries. A list of destination hosts for +# fluentd. Each should be of the form {host=>'my.host.name', +# 'port'=>24224} +# +# [*fluentd_groups*] +# (Optional) List of strings. Add the 'fluentd' user to these groups. +# +# [*fluentd_pos_file_path*] +# (Optional) String. Path to a directory that will be created +# if it does not exist and made writable by the fluentd user. +# +# [*fluentd_use_ssl*] +# (Optional) Boolean. If true, use the secure_forward plugin. +# +# [*fluentd_ssl_certificate*] +# (Required if fluentd_use_ssl is true) PEM encoded certificate data from +# for example "secure-forward-ca-generate". +# +# [*fluentd_shared_key*] +# (Required if fluentd_use_ssl is true) Shared secret key for fluentd +# secure-foward plugin. +# +# [*fluentd_listen_syslog*] +# (Optional, default true) When true, fluentd will listen for syslog +# messages on a local UDP port. +# +# [*fluentd_syslog_port*] +# (Optional, default 42185) Port on which fluentd should listen if +# $fluentd_listen_syslog is true. +class tripleo::profile::base::logging::fluentd ( + $step = hiera('step', undef), + $fluentd_sources = undef, + $fluentd_filters = undef, + $fluentd_servers = undef, + $fluentd_groups = undef, + $fluentd_pos_file_path = undef, + $fluentd_use_ssl = undef, + $fluentd_ssl_certificate = undef, + $fluentd_shared_key = undef, + $fluentd_listen_syslog = true, + $fluentd_syslog_port = 42185 +) { + if $step == undef or $step >= 3 { + include ::fluentd + + if $fluentd_groups { + user { $::fluentd::config_owner: + ensure => present, + groups => $fluentd_groups, + membership => 'minimum', + } + } + + if $fluentd_pos_file_path { + file { $fluentd_pos_file_path: + ensure => 'directory', + owner => $::fluentd::config_owner, + group => $::fluentd::config_group, + mode => '0750', + } + } + + ::fluentd::plugin { 'rubygem-fluent-plugin-add': + plugin_provider => 'yum', + } + + if $fluentd_sources { + ::fluentd::config { '100-openstack-sources.conf': + config => { + 'source' => $fluentd_sources, + } + } + } + + if $fluentd_listen_syslog { + # fluentd will receive syslog messages by listening on a local udp + # socket. + ::fluentd::config { '110-system-sources.conf': + config => { + 'source' => { + 'type' => 'syslog', + 'tag' => 'system.messages', + 'port' => $fluentd_syslog_port, + } + } + } + + file { '/etc/rsyslog.d/fluentd.conf': + content => "*.* @127.0.0.1:${fluentd_syslog_port}", + owner => 'root', + group => 'root', + mode => '0644', + } ~> exec { 'reload rsyslog': + command => '/bin/systemctl restart rsyslog', + } + } + + if $fluentd_filters { + ::fluentd::config { '200-openstack-filters.conf': + config => { + 'filter' => $fluentd_filters, + } + } + } + + if $fluentd_servers and !empty($fluentd_servers) { + if $fluentd_use_ssl { + ::fluentd::plugin { 'rubygem-fluent-plugin-secure-forward': + plugin_provider => 'yum', + } + + file {'/etc/fluentd/ca_cert.pem': + content => $fluentd_ssl_certificate, + owner => $::fluentd::config_owner, + group => $::fluentd::config_group, + mode => '0444', + } + + ::fluentd::config { '300-openstack-matches.conf': + config => { + 'match' => { + # lint:ignore:single_quote_string_with_variables + # lint:ignore:quoted_booleans + 'type' => 'secure_forward', + 'tag_pattern' => '**', + 'self_hostname' => '${hostname}', + 'secure' => 'true', + 'ca_cert_path' => '/etc/fluentd/ca_cert.pem', + 'shared_key' => $fluentd_shared_key, + 'server' => $fluentd_servers, + # lint:endignore + # lint:endignore + } + } + } + } else { + ::fluentd::config { '300-openstack-matches.conf': + config => { + 'match' => { + 'type' => 'forward', + 'tag_pattern' => '**', + 'server' => $fluentd_servers, + } + } + } + } + } + } +} diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp index 9a3a314..89ff810 100644 --- a/manifests/profile/base/manila/api.pp +++ b/manifests/profile/base/manila/api.pp @@ -23,11 +23,18 @@ # for more details. # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::manila::api ( - $step = hiera('step'), + $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $step >= 4 { - include ::manila + class { '::manila' : + rabbit_hosts => $rabbit_hosts, + } include ::manila::api } } diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp index 7b07b1f..90a5c23 100644 --- a/manifests/profile/base/neutron.pp +++ b/manifests/profile/base/neutron.pp @@ -22,11 +22,18 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::neutron ( - $step = hiera('step'), + $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $step >= 3 { - include ::neutron + class { '::neutron' : + rabbit_hosts => $rabbit_hosts, + } include ::neutron::config } } diff --git a/manifests/profile/base/monitoring/fluentd.pp b/manifests/profile/base/neutron/opencontrail/vrouter.pp index 8160452..90ab71c 100644 --- a/manifests/profile/base/monitoring/fluentd.pp +++ b/manifests/profile/base/neutron/opencontrail/vrouter.pp @@ -12,28 +12,29 @@ # License for the specific language governing permissions and limitations # under the License. # -# == Class: tripleo::profile::base::monitoring::fluentd +# == Class: tripleo::profile::base::neutron::opencontrail::vrouter # -# FluentD configuration for TripleO +# Opencontrail profile to run the contrail vrouter # # === Parameters # # [*step*] -# (Optional) String. The current step of the deployment +# (Optional) The current step of the deployment # Defaults to hiera('step') # -class tripleo::profile::base::monitoring::fluentd ( - $step = hiera('step', undef) +class tripleo::profile::base::neutron::opencontrail::vrouter ( + $step = hiera('step'), ) { - if $step == undef or $step >= 3 { - include ::fluentd - ::fluentd::plugin { 'rubygem-fluent-plugin-add': - plugin_provider => 'yum', - } + if $step >= 4 { + + include ::contrail::vrouter + # NOTE: it's not possible to use this class without a functional + # contrail controller up and running + #class {'::contrail::vrouter::provision_vrouter': + # require => Class['contrail::vrouter'], + #} - ::fluentd::plugin { 'rubygem-fluent-plugin-elasticsearch': - plugin_provider => 'yum', - } } + } diff --git a/manifests/profile/base/neutron/plumgrid.pp b/manifests/profile/base/neutron/plumgrid.pp new file mode 100644 index 0000000..03dc101 --- /dev/null +++ b/manifests/profile/base/neutron/plumgrid.pp @@ -0,0 +1,45 @@ +# 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::neutron::plumgrid +# +# Plumgrid Neutron helper profile (extra settings for compute, etc. roles) +# +# === Parameters +# [*step*] +# (Optional) The current step of the deployment +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::plumgrid ( + $step = hiera('step'), +) { + + if $step >= 4 { + + # forward all ipv4 traffic + # this is required for the vms to pass through the gateways public interface + sysctl::value { 'net.ipv4.ip_forward': value => '1' } + + # ifc_ctl_pp needs to be invoked by root as part of the vif.py when a VM is powered on + file { '/etc/sudoers.d/ifc_ctl_sudoers': + ensure => file, + owner => root, + group => root, + mode => '0440', + content => "nova ALL=(root) NOPASSWD: /opt/pg/bin/ifc_ctl_pp *\n", + } + + } + +} diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index b43b8e8..74f0460 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -38,12 +38,17 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::nova ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $libvirt_enabled = false, $manage_migration = false, $nova_compute_enabled = false, $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -58,7 +63,9 @@ class tripleo::profile::base::nova ( } if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) { - include ::nova + class { '::nova' : + rabbit_hosts => $rabbit_hosts, + } include ::nova::config class { '::nova::cache': enabled => true, diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp index 96d23a6..cf0ee90 100644 --- a/manifests/profile/base/sahara.pp +++ b/manifests/profile/base/sahara.pp @@ -26,9 +26,14 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # +# [*rabbit_hosts*] +# list of the rabbbit host IPs +# Defaults to hiera('rabbitmq_node_ips') + class tripleo::profile::base::sahara ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = hiera('step'), + $rabbit_hosts = hiera('rabbitmq_node_ips', undef), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -38,7 +43,8 @@ class tripleo::profile::base::sahara ( if $step >= 4 or ($step >= 3 and $sync_db){ class { '::sahara': - sync_db => $sync_db, + sync_db => $sync_db, + rabbit_hosts => $rabbit_hosts, } } } diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 1e763a1..a95d05f 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -23,14 +23,27 @@ # for more details. # Defaults to hiera('step') # +# [*memcache_servers*] +# (Optional) List of memcache servers +# Defaults to hiera('memcached_node_ips') +# +# [*memcache_port*] +# (Optional) memcache port +# Defaults to 11211 +# class tripleo::profile::base::swift::proxy ( $step = hiera('step'), + $memcache_servers = hiera('memcached_node_ips'), + $memcache_port = 11211, ) { if $step >= 4 { + $swift_memcache_servers = suffix($memcache_servers, ":${memcache_port}") include ::swift::proxy include ::swift::proxy::proxy_logging include ::swift::proxy::healthcheck - include ::swift::proxy::cache + class { '::swift::proxy::cache': + memcache_servers => $swift_memcache_servers + } include ::swift::proxy::keystone include ::swift::proxy::authtoken include ::swift::proxy::staticweb |