aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-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/neutron/opendaylight.pp8
-rw-r--r--manifests/profile/base/neutron/opendaylight/configure_cluster.pp45
-rw-r--r--manifests/profile/base/neutron/opendaylight/create_cluster.pp43
-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/ovn_northd.pp4
-rw-r--r--releasenotes/notes/cleanup_odl_clustering-7efdd58639df88a5.yaml8
-rw-r--r--spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb6
16 files changed, 49 insertions, 135 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/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp
index 7a35b6b..796d63e 100644
--- a/manifests/profile/base/neutron/opendaylight.pp
+++ b/manifests/profile/base/neutron/opendaylight.pp
@@ -33,7 +33,6 @@
class tripleo::profile::base::neutron::opendaylight (
$step = Integer(hiera('step')),
$odl_api_ips = hiera('opendaylight_api_node_ips'),
- $node_name = hiera('bootstrap_nodeid')
) {
if $step >= 1 {
@@ -43,12 +42,9 @@ class tripleo::profile::base::neutron::opendaylight (
} elsif size($odl_api_ips) == 2 {
fail('2 node OpenDaylight deployments are unsupported. Use 1 or greater than 2')
} elsif size($odl_api_ips) > 2 {
- $node_string = split($node_name, '-')
- $ha_node_index = $node_string[-1] + 1
class { '::opendaylight':
- enable_ha => true,
- ha_node_ips => $odl_api_ips,
- ha_node_index => $ha_node_index,
+ enable_ha => true,
+ ha_node_ips => $odl_api_ips,
}
} else {
include ::opendaylight
diff --git a/manifests/profile/base/neutron/opendaylight/configure_cluster.pp b/manifests/profile/base/neutron/opendaylight/configure_cluster.pp
deleted file mode 100644
index 022e8ae..0000000
--- a/manifests/profile/base/neutron/opendaylight/configure_cluster.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2017 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.
-#
-# Configures an OpenDaylight cluster.
-# It creates the akka configuration file for ODL to cluster correctly
-# It will not configure clustering if less than 3 nodes
-#
-# == Function: tripleo::profile::base::neutron::opendaylight::configure_cluster
-#
-# == Parameters
-#
-# [*node_name*]
-# The short hostname of node
-#
-# [*odl_api_ips*] Array of IPs per ODL node
-# Defaults to empty array
-#
-define tripleo::profile::base::neutron::opendaylight::configure_cluster(
- $node_name,
- $odl_api_ips = [],
-) {
- validate_array($odl_api_ips)
- if size($odl_api_ips) > 2 {
- $node_string = split($node_name, '-')
- $ha_node_index = $node_string[-1] + 1
- $ha_node_ip_str = join($odl_api_ips, ' ')
- exec { 'Configure ODL Clustering':
- command => "configure_cluster.sh ${ha_node_index} ${ha_node_ip_str}",
- path => '/opt/opendaylight/bin/:/usr/sbin:/usr/bin:/sbin:/bin',
- creates => '/opt/opendaylight/configuration/initial/akka.conf'
- }
- }
-}
-
diff --git a/manifests/profile/base/neutron/opendaylight/create_cluster.pp b/manifests/profile/base/neutron/opendaylight/create_cluster.pp
deleted file mode 100644
index 94cd898..0000000
--- a/manifests/profile/base/neutron/opendaylight/create_cluster.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2017 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.
-#
-# Configures an OpenDaylight cluster.
-# It creates the akka configuration file for ODL to cluster correctly
-# It will not configure clustering if less than 3 nodes
-#
-# == Class: tripleo::profile::base::neutron::opendaylight::create_cluster
-#
-# OpenDaylight class only used for creating clusters with container deployments
-#
-# === Parameters
-#
-# [*odl_api_ips*]
-# (Optional) List of OpenStack Controller IPs for ODL API
-# Defaults to hiera('opendaylight_api_node_ips')
-#
-# [*node_name*]
-# (Optional) The short hostname of node
-# Defaults to hiera('bootstrap_nodeid')
-#
-class tripleo::profile::base::neutron::opendaylight::create_cluster (
- $odl_api_ips = hiera('opendaylight_api_node_ips'),
- $node_name = hiera('bootstrap_nodeid')
-) {
-
- tripleo::profile::base::neutron::opendaylight::configure_cluster {'ODL cluster':
- node_name => $node_name,
- odl_api_ips => $odl_api_ips,
- }
-
-}
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/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/releasenotes/notes/cleanup_odl_clustering-7efdd58639df88a5.yaml b/releasenotes/notes/cleanup_odl_clustering-7efdd58639df88a5.yaml
new file mode 100644
index 0000000..3434377
--- /dev/null
+++ b/releasenotes/notes/cleanup_odl_clustering-7efdd58639df88a5.yaml
@@ -0,0 +1,8 @@
+---
+deprecations:
+ - Deprecates and removes workaround OpenDaylight
+ clustering function and class. Clustering config
+ is now handled by puppet-opendaylight.
+ - Removes deprecated opendaylight parameter
+ 'ha_node_index' which is no longer needed to
+ configure clustering.
diff --git a/spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb b/spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb
index 1eb79ae..b6082a6 100644
--- a/spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb
+++ b/spec/classes/tripleo_profile_base_neutron_opendaylight_spec.rb
@@ -18,8 +18,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::neutron::opendaylight' do
let :params do
- { :step => 1,
- :node_name => 'overcloud-controller-0',
+ { :step => 1
}
end
shared_examples_for 'tripleo::profile::base::neutron::opendaylight' do
@@ -69,8 +68,7 @@ describe 'tripleo::profile::base::neutron::opendaylight' do
it 'should install and configure OpenDaylight in HA' do
is_expected.to contain_class('opendaylight').with(
:enable_ha => true,
- :ha_node_ips => params[:odl_api_ips],
- :ha_node_index => '1',
+ :ha_node_ips => params[:odl_api_ips]
)
end
end