summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/glance/nfs_mount.pp4
-rw-r--r--manifests/pacemaker/haproxy_with_vip.pp8
-rw-r--r--manifests/pacemaker/resource_restart_flag.pp4
-rw-r--r--manifests/profile/base/cinder/volume/nfs.pp19
-rw-r--r--manifests/profile/base/docker.pp8
-rw-r--r--manifests/profile/base/logging/fluentd.pp4
-rw-r--r--manifests/profile/base/nova/compute/libvirt.pp20
-rw-r--r--manifests/profile/base/nova/compute_libvirt_shared.pp46
-rw-r--r--manifests/profile/base/nova/libvirt.pp3
-rw-r--r--manifests/profile/base/pacemaker.pp4
-rw-r--r--manifests/profile/base/swift/ringbuilder.pp12
-rw-r--r--manifests/profile/pacemaker/ceph/rbdmirror.pp4
-rw-r--r--manifests/profile/pacemaker/cinder/backup.pp3
-rw-r--r--manifests/profile/pacemaker/database/mysql_bundle.pp4
-rw-r--r--manifests/profile/pacemaker/database/redis_bundle.pp2
-rw-r--r--manifests/profile/pacemaker/ovn_northd.pp4
-rw-r--r--manifests/profile/pacemaker/rabbitmq_bundle.pp4
17 files changed, 92 insertions, 61 deletions
diff --git a/manifests/glance/nfs_mount.pp b/manifests/glance/nfs_mount.pp
index 674bdd0..9ff4f8b 100644
--- a/manifests/glance/nfs_mount.pp
+++ b/manifests/glance/nfs_mount.pp
@@ -62,8 +62,8 @@ class tripleo::glance::nfs_mount (
file { $images_dir:
ensure => directory,
- } ->
- exec { 'NFS mount for glance file backend':
+ }
+ -> exec { 'NFS mount for glance file backend':
path => ['/usr/sbin', '/usr/bin'],
command => "mount -t nfs '${share}' '${images_dir}' ${options_part}",
unless => "mount | grep ' ${images_dir} '",
diff --git a/manifests/pacemaker/haproxy_with_vip.pp b/manifests/pacemaker/haproxy_with_vip.pp
index 606ac26..14572e0 100644
--- a/manifests/pacemaker/haproxy_with_vip.pp
+++ b/manifests/pacemaker/haproxy_with_vip.pp
@@ -104,9 +104,9 @@ define tripleo::pacemaker::haproxy_with_vip(
default => Pacemaker::Resource::Service['haproxy']
}
- Pacemaker::Resource::Ip["${vip_name}_vip"] ->
- $service_resource ->
- Pacemaker::Constraint::Order["${vip_name}_vip-then-haproxy"] ->
- Pacemaker::Constraint::Colocation["${vip_name}_vip-with-haproxy"]
+ Pacemaker::Resource::Ip["${vip_name}_vip"]
+ -> $service_resource
+ -> Pacemaker::Constraint::Order["${vip_name}_vip-then-haproxy"]
+ -> Pacemaker::Constraint::Colocation["${vip_name}_vip-with-haproxy"]
}
}
diff --git a/manifests/pacemaker/resource_restart_flag.pp b/manifests/pacemaker/resource_restart_flag.pp
index c201c9b..860250b 100644
--- a/manifests/pacemaker/resource_restart_flag.pp
+++ b/manifests/pacemaker/resource_restart_flag.pp
@@ -41,6 +41,6 @@ define tripleo::pacemaker::resource_restart_flag() {
refreshonly => true,
}
- File['/var/lib/tripleo/pacemaker-restarts'] ->
- Exec["${title} resource restart flag"]
+ File['/var/lib/tripleo/pacemaker-restarts']
+ -> Exec["${title} resource restart flag"]
}
diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp
index 16a49e4..1eef888 100644
--- a/manifests/profile/base/cinder/volume/nfs.pp
+++ b/manifests/profile/base/cinder/volume/nfs.pp
@@ -62,21 +62,22 @@ class tripleo::profile::base::cinder::volume::nfs (
include ::tripleo::profile::base::cinder::volume
if $step >= 4 {
- if str2bool($::selinux) {
- selboolean { 'virt_use_nfs':
- value => on,
- persistent => true,
- } -> Package['nfs-utils']
- }
-
- package {'nfs-utils': } ->
- cinder::backend::nfs { $backend_name :
+ package {'nfs-utils': }
+ -> cinder::backend::nfs { $backend_name :
nfs_servers => $cinder_nfs_servers,
nfs_mount_options => $cinder_nfs_mount_options,
nfs_shares_config => '/etc/cinder/shares-nfs.conf',
nas_secure_file_operations => $cinder_nas_secure_file_operations,
nas_secure_file_permissions => $cinder_nas_secure_file_permissions,
}
+
+ if str2bool($::selinux) {
+ selboolean { 'virt_use_nfs':
+ value => on,
+ persistent => true,
+ require => Package['nfs-utils'],
+ }
+ }
}
}
diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp
index 2c9824a..e042947 100644
--- a/manifests/profile/base/docker.pp
+++ b/manifests/profile/base/docker.pp
@@ -185,8 +185,8 @@ class tripleo::profile::base::docker (
group { 'docker_nova_group':
name => 'docker_nova',
gid => $docker_nova_uid
- } ->
- user { 'docker_nova_user':
+ }
+ -> user { 'docker_nova_user':
name => 'docker_nova',
uid => $docker_nova_uid,
gid => $docker_nova_uid,
@@ -207,8 +207,8 @@ polkit.addRule(function(action, subject) {
'
package {'polkit':
ensure => installed,
- } ->
- file {'/etc/polkit-1/rules.d/50-nova.rules':
+ }
+ -> file {'/etc/polkit-1/rules.d/50-nova.rules':
content => $docker_nova_polkit_rule,
mode => '0644'
}
diff --git a/manifests/profile/base/logging/fluentd.pp b/manifests/profile/base/logging/fluentd.pp
index 51869d6..b23610a 100644
--- a/manifests/profile/base/logging/fluentd.pp
+++ b/manifests/profile/base/logging/fluentd.pp
@@ -76,8 +76,8 @@ class tripleo::profile::base::logging::fluentd (
include ::fluentd
if $fluentd_groups {
- Package<| tag == 'openstack' |> ->
- user { $::fluentd::config_owner:
+ Package<| tag == 'openstack' |>
+ -> user { $::fluentd::config_owner:
ensure => present,
groups => $fluentd_groups,
membership => 'minimum',
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index 8a7c4d6..ccecaf2 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -29,25 +29,7 @@ class tripleo::profile::base::nova::compute::libvirt (
if $step >= 4 {
include ::tripleo::profile::base::nova::compute
include ::tripleo::profile::base::nova::migration::client
-
- # Ceph + Libvirt
- $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
- $rbd_persistent_storage = hiera('rbd_persistent_storage', false)
- if $rbd_ephemeral_storage or $rbd_persistent_storage {
- include ::nova::compute::rbd
- }
-
- if $rbd_ephemeral_storage {
- class { '::nova::compute::libvirt':
- libvirt_disk_cachemodes => ['network=writeback'],
- libvirt_hw_disk_discard => 'unmap',
- }
- } else {
- include ::nova::compute::libvirt
- }
-
- include ::nova::compute::libvirt::qemu
-
}
+ include ::tripleo::profile::base::nova::compute_libvirt_shared
}
diff --git a/manifests/profile/base/nova/compute_libvirt_shared.pp b/manifests/profile/base/nova/compute_libvirt_shared.pp
new file mode 100644
index 0000000..36235cd
--- /dev/null
+++ b/manifests/profile/base/nova/compute_libvirt_shared.pp
@@ -0,0 +1,46 @@
+# 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::nova::compute_libvirt_shared
+#
+# Libvirt profile for tripleo. It will deploy Libvirt service and configure it.
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::nova::compute_libvirt_shared (
+ $step = Integer(hiera('step')),
+) {
+ if $step >= 4 {
+ # Ceph + Libvirt
+ $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false)
+ $rbd_persistent_storage = hiera('rbd_persistent_storage', false)
+ if $rbd_ephemeral_storage or $rbd_persistent_storage {
+ include ::nova::compute::rbd
+ }
+
+ if $rbd_ephemeral_storage {
+ class { '::nova::compute::libvirt':
+ libvirt_disk_cachemodes => ['network=writeback'],
+ libvirt_hw_disk_discard => 'unmap',
+ }
+ } else {
+ include ::nova::compute::libvirt
+ }
+ }
+}
diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp
index 06baa39..332e33b 100644
--- a/manifests/profile/base/nova/libvirt.pp
+++ b/manifests/profile/base/nova/libvirt.pp
@@ -44,6 +44,9 @@ class tripleo::profile::base::nova::libvirt (
onlyif => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"',
before => Service['libvirt'],
}
+
+ include ::nova::compute::libvirt::qemu
}
+ include ::tripleo::profile::base::nova::compute_libvirt_shared
}
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index bc15e62..d468110 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -104,8 +104,8 @@ class tripleo::profile::base::pacemaker (
}
class { '::pacemaker':
hacluster_pwd => hiera('hacluster_pwd'),
- } ->
- class { '::pacemaker::corosync':
+ }
+ -> class { '::pacemaker::corosync':
cluster_members => $pacemaker_cluster_members,
setup_cluster => $pacemaker_master,
cluster_setup_extras => $cluster_setup_extras,
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index 3ab3234..27cf4fe 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -94,8 +94,8 @@ class tripleo::profile::base::swift::ringbuilder (
path => ['/usr/bin'],
command => "curl --insecure --silent '${swift_ring_get_tempurl}' -o /tmp/swift-rings.tar.gz",
returns => [0, 3]
- } ~>
- exec{'extract_swift_ring_tarball':
+ }
+ ~> exec{'extract_swift_ring_tarball':
path => ['/bin'],
command => 'tar xzf /tmp/swift-rings.tar.gz -C /',
returns => [0, 2]
@@ -122,15 +122,15 @@ class tripleo::profile::base::swift::ringbuilder (
part_power => $part_power,
replicas => min(count($device_array), $replicas),
min_part_hours => $min_part_hours,
- } ->
+ }
# add all other devices
- tripleo::profile::base::swift::add_devices {$device_array:
+ -> tripleo::profile::base::swift::add_devices {$device_array:
swift_zones => $swift_zones,
- } ->
+ }
# rebalance
- swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
+ -> swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
seed => '999',
}
diff --git a/manifests/profile/pacemaker/ceph/rbdmirror.pp b/manifests/profile/pacemaker/ceph/rbdmirror.pp
index 6b566a7..2be9915 100644
--- a/manifests/profile/pacemaker/ceph/rbdmirror.pp
+++ b/manifests/profile/pacemaker/ceph/rbdmirror.pp
@@ -76,8 +76,8 @@ class tripleo::profile::pacemaker::ceph::rbdmirror (
ceph::mirror { $client_name:
rbd_mirror_enable => false,
rbd_mirror_ensure => 'stopped',
- } ->
- pacemaker::resource::service { "ceph-rbd-mirror_${client_name}":
+ }
+ -> pacemaker::resource::service { "ceph-rbd-mirror_${client_name}":
# NOTE(gfidente): systemd uses the @ sign but it is an invalid
# character in a pcmk resource name, so we need to use it only
# for the name of the service
diff --git a/manifests/profile/pacemaker/cinder/backup.pp b/manifests/profile/pacemaker/cinder/backup.pp
index 933a735..17ed95d 100644
--- a/manifests/profile/pacemaker/cinder/backup.pp
+++ b/manifests/profile/pacemaker/cinder/backup.pp
@@ -63,8 +63,7 @@ class tripleo::profile::pacemaker::cinder::backup (
if $step >= 3 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
Cinder_config<||>
- ~>
- tripleo::pacemaker::resource_restart_flag { "${::cinder::params::backup_service}": }
+ ~> tripleo::pacemaker::resource_restart_flag { "${::cinder::params::backup_service}": }
}
if $step >= 5 and $pacemaker_master {
diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp
index a80b2de..21d671c 100644
--- a/manifests/profile/pacemaker/database/mysql_bundle.pp
+++ b/manifests/profile/pacemaker/database/mysql_bundle.pp
@@ -20,11 +20,11 @@
#
# [*mysql_docker_image*]
# (Optional) The docker image to use for creating the pacemaker bundle
-# Defaults to hiera('tripleo::profile::pacemaker::database::redis_bundle::mysql_docker_image', undef)
+# Defaults to hiera('tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image', undef)
#
# [*control_port*]
# (Optional) The bundle's pacemaker_remote control port on the host
-# Defaults to hiera('tripleo::profile::pacemaker::database::redis_bundle::control_port', '3123')
+# Defaults to hiera('tripleo::profile::pacemaker::database::mysql_bundle::control_port', '3123')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp
index ea153a8..8b18858 100644
--- a/manifests/profile/pacemaker/database/redis_bundle.pp
+++ b/manifests/profile/pacemaker/database/redis_bundle.pp
@@ -24,7 +24,7 @@
#
# [*redis_docker_control_port*]
# (Optional) The bundle's pacemaker_remote control port on the host
-# Defaults to hiera('tripleo::profile::pacemaker::redis_bundle::control_port', '3121')
+# Defaults to hiera('tripleo::profile::pacemaker::redis_bundle::control_port', '3124')
#
# [*pcs_tries*]
# (Optional) The number of times pcs commands should be retried.
diff --git a/manifests/profile/pacemaker/ovn_northd.pp b/manifests/profile/pacemaker/ovn_northd.pp
index 212c345..4f39a7b 100644
--- a/manifests/profile/pacemaker/ovn_northd.pp
+++ b/manifests/profile/pacemaker/ovn_northd.pp
@@ -93,7 +93,7 @@ class tripleo::profile::pacemaker::ovn_northd (
tries => $pcs_tries,
}
- Pacemaker::Resource::Ocf["${ovndb_servers_resource_name}"] ->
- Pacemaker::Constraint::Colocation["${ovndb_vip_resource_name}-with-${ovndb_servers_resource_name}"]
+ Pacemaker::Resource::Ocf["${ovndb_servers_resource_name}"]
+ -> Pacemaker::Constraint::Colocation["${ovndb_vip_resource_name}-with-${ovndb_servers_resource_name}"]
}
}
diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index 2f848b4..5dd22d2 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@@ -24,7 +24,7 @@
#
# [*rabbitmq_docker_control_port*]
# (Optional) The bundle's pacemaker_remote control port on the host
-# Defaults to hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3121')
+# Defaults to hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3122')
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
@@ -55,7 +55,7 @@
#
class tripleo::profile::pacemaker::rabbitmq_bundle (
$rabbitmq_docker_image = hiera('tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_image', undef),
- $rabbitmq_docker_control_port = hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3121'),
+ $rabbitmq_docker_control_port = hiera('tripleo::profile::pacemaker::rabbitmq_bundle::control_port', '3122'),
$bootstrap_node = hiera('rabbitmq_short_bootstrap_node_name'),
$erlang_cookie = hiera('rabbitmq::erlang_cookie'),
$user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0),