aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/profile/base/ceilometer.pp12
-rw-r--r--manifests/profile/base/ceilometer/collector.pp4
-rw-r--r--manifests/profile/base/ceph.pp80
-rw-r--r--manifests/profile/base/ceph/client.pp35
-rw-r--r--manifests/profile/base/ceph/mon.pp48
-rw-r--r--manifests/profile/base/ceph/osd.pp54
-rw-r--r--manifests/profile/base/ironic.pp43
-rw-r--r--manifests/profile/base/ironic/api.pp (renamed from lib/facter/galera_bootstrapped.rb)30
-rw-r--r--manifests/profile/base/ironic/conductor.pp37
-rw-r--r--manifests/profile/base/neutron/plugins/ml2.pp (renamed from manifests/profile/base/neutron/ml2.pp)9
-rw-r--r--manifests/profile/base/neutron/plugins/nuage.pp3
-rw-r--r--manifests/profile/base/neutron/plugins/opencontrail.pp3
-rw-r--r--manifests/profile/base/neutron/plugins/plumgrid.pp3
-rw-r--r--manifests/profile/base/neutron/server.pp2
-rw-r--r--manifests/profile/base/nova.pp27
-rw-r--r--manifests/profile/base/nova/api.pp3
-rw-r--r--manifests/profile/base/nova/compute.pp20
-rw-r--r--manifests/profile/base/nova/compute/libvirt.pp2
-rw-r--r--manifests/profile/base/swift/storage.pp52
-rw-r--r--manifests/profile/pacemaker/keystone.pp8
-rw-r--r--manifests/profile/pacemaker/neutron.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/dhcp.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/l3.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/metadata.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/midonet.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/ovs.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/plugins/ml2.pp (renamed from manifests/profile/pacemaker/neutron/ml2.pp)10
-rw-r--r--manifests/profile/pacemaker/neutron/plugins/nuage.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/plugins/opencontrail.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/plugins/plumgrid.pp4
-rw-r--r--manifests/profile/pacemaker/neutron/server.pp7
31 files changed, 466 insertions, 62 deletions
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index a7d62ce..97e1bb8 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -23,18 +23,16 @@
# for more details.
# Defaults to hiera('step')
#
-# [*pacemaker_master*]
-# (Optional) The master node runs some tasks
-# one step earlier than others; disable to
-# the node is not the master.
+# [*sync_db*]
+# (Optional) Whether to run db sync
# Defaults to true
-
+#
class tripleo::profile::base::ceilometer (
$step = hiera('step'),
- $pacemaker_master = true,
+ $sync_db = true,
) {
- if $step >= 4 or ($step >= 3 and $pacemaker_master) {
+ if $step >= 4 or ($step >= 3 and $sync_db) {
include ::ceilometer
include ::ceilometer::db
include ::ceilometer::config
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp
index 6891f9c..34ee90b 100644
--- a/manifests/profile/base/ceilometer/collector.pp
+++ b/manifests/profile/base/ceilometer/collector.pp
@@ -33,9 +33,7 @@ class tripleo::profile::base::ceilometer::collector (
$sync_db = true,
) {
- class { '::tripleo::profile::base::ceilometer':
- pacemaker_master => $sync_db,
- }
+ include ::tripleo::profile::base::ceilometer
if $step >= 3 and $sync_db {
$ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb'))
diff --git a/manifests/profile/base/ceph.pp b/manifests/profile/base/ceph.pp
new file mode 100644
index 0000000..94166ac
--- /dev/null
+++ b/manifests/profile/base/ceph.pp
@@ -0,0 +1,80 @@
+# 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::ceph
+#
+# Ceph base profile for tripleo
+#
+# === Parameters
+#
+# [*ceph_ipv6*]
+# (Optional) Force daemons to bind on IPv6 addresses
+# Defaults to false
+#
+# [*ceph_mon_initial_members*]
+# (Optional) List of IP addresses to use as mon_initial_members
+# Defaults to undef
+#
+# [*ceph_mon_host*]
+# (Optional) List of IP addresses to use as mon_host
+# Deftauls to undef
+#
+# [*ceph_mon_host_v6*]
+# (Optional) List of IPv6 addresses, surrounded by brackets, used as
+# mon_host when ceph_ipv6 is true
+# Defaults to undef
+#
+# [*enable_ceph_storage*]
+# (Optional) enable_ceph_storage
+# Deprecated: defaults to false
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::ceph (
+ $ceph_ipv6 = false,
+ $ceph_mon_initial_members = undef,
+ $ceph_mon_host = undef,
+ $ceph_mon_host_v6 = undef,
+ $enable_ceph_storage = false,
+ $step = hiera('step'),
+) {
+
+ if $step >= 2 {
+ if $ceph_mon_initial_members {
+ $mon_initial_members = downcase($ceph_mon_initial_members)
+ } else {
+ $mon_initial_members = undef
+ }
+ if $ceph_ipv6 {
+ $mon_host = $ceph_mon_host_v6
+ } else {
+ $mon_host = $ceph_mon_host
+ }
+
+ class { '::ceph::profile::params':
+ mon_initial_members => $mon_initial_members,
+ mon_host => $mon_host,
+ }
+
+ include ::ceph::conf
+ }
+
+ # TODO: deprecated boolean
+ if $enable_ceph_storage {
+ include ::tripleo::profile::base::ceph::osd
+ }
+}
diff --git a/manifests/profile/base/ceph/client.pp b/manifests/profile/base/ceph/client.pp
new file mode 100644
index 0000000..851324a
--- /dev/null
+++ b/manifests/profile/base/ceph/client.pp
@@ -0,0 +1,35 @@
+# 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::ceph::client
+#
+# Ceph client profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::ceph::client (
+ $step = hiera('step'),
+) {
+
+ include ::tripleo::profile::base::ceph
+
+ if $step >= 2 {
+ include ::ceph::profile::client
+ }
+}
diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp
new file mode 100644
index 0000000..48c3721
--- /dev/null
+++ b/manifests/profile/base/ceph/mon.pp
@@ -0,0 +1,48 @@
+# 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::ceph::mon
+#
+# Ceph Monitor profile for tripleo
+#
+# === Parameters
+#
+# [*ceph_pools*]
+# (Optional) List of pools to create
+# Defaults to []
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::ceph::mon (
+ $ceph_pools = [],
+ $step = hiera('step'),
+) {
+
+ include ::tripleo::profile::base::ceph
+
+ if $step >= 2 {
+ include ::ceph::profile::mon
+ }
+
+ if $step >= 4 {
+ ceph::pool { $ceph_pools :
+ pg_num => hiera('ceph::profile::params::osd_pool_default_pg_num'),
+ pgp_num => hiera('ceph::profile::params::osd_pool_default_pgp_num'),
+ size => hiera('ceph::profile::params::osd_pool_default_size'),
+ }
+ }
+}
diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp
new file mode 100644
index 0000000..a9224d3
--- /dev/null
+++ b/manifests/profile/base/ceph/osd.pp
@@ -0,0 +1,54 @@
+# 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::ceph::osd
+#
+# Ceph OSD profile for tripleo
+#
+# === Parameters
+#
+# [*ceph_osd_selinux_permissive*]
+# (Optional) Wheter to configure SELinux in permissive mode
+# Default to false
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::ceph::osd (
+ $ceph_osd_selinux_permissive = false,
+ $step = hiera('step'),
+) {
+
+ include ::tripleo::profile::base::ceph
+
+ if $step >= 2 {
+ if $ceph_osd_selinux_permissive {
+ exec { 'set selinux to permissive on boot':
+ command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config",
+ onlyif => "test -f /etc/selinux/config && ! grep '^SELINUX=permissive' /etc/selinux/config",
+ path => ['/usr/bin', '/usr/sbin'],
+ }
+
+ exec { 'set selinux to permissive':
+ command => 'setenforce 0',
+ onlyif => "which setenforce && getenforce | grep -i 'enforcing'",
+ path => ['/usr/bin', '/usr/sbin'],
+ } -> Class['ceph::profile::osd']
+ }
+
+ include ::ceph::profile::osd
+ }
+}
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
new file mode 100644
index 0000000..139654b
--- /dev/null
+++ b/manifests/profile/base/ironic.pp
@@ -0,0 +1,43 @@
+# 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::ironic
+#
+# Ironic profile for TripleO
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step of the deployment
+# Defaults to hiera('step')
+#
+# [*sync_db*]
+# (Optional) Whether to run db sync
+# Defaults to true
+#
+class tripleo::profile::base::ironic (
+ $step = hiera('step'),
+ $sync_db = true,
+) {
+
+ if $step >= 3 {
+ include ::ironic
+
+ # Database is accessed by both API and conductor, hence it's here.
+ if $sync_db {
+ include ::ironic::db::mysql
+ include ::ironic::db::sync
+ }
+ }
+}
diff --git a/lib/facter/galera_bootstrapped.rb b/manifests/profile/base/ironic/api.pp
index ea9fe8c..1406e2d 100644
--- a/lib/facter/galera_bootstrapped.rb
+++ b/manifests/profile/base/ironic/api.pp
@@ -1,19 +1,33 @@
-# Copyright 2015 Red Hat, Inc.
-# All Rights Reserved.
+# 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
+# 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.
-Facter.add('galera_bootstrapped') do
- setcode do
- FileTest.exists?('/var/lib/mysql/grastate.dat')
- end
-end
+#
+# == Class: tripleo::profile::base::ironic::conductor
+#
+# Ironic API profile for TripleO
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step of the deployment
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::ironic::api (
+ $step = hiera('step'),
+) {
+
+ include ::tripleo::profile::base::ironic
+ if $step >= 4 {
+ include ::ironic::api
+ }
+}
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
new file mode 100644
index 0000000..7a587a5
--- /dev/null
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -0,0 +1,37 @@
+# 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::ironic::conductor
+#
+# Ironic conductor profile for TripleO
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step of the deployment
+# Defaults to hiera('step')
+#
+class tripleo::profile::base::ironic::conductor (
+ $step = hiera('step'),
+) {
+
+ include ::tripleo::profile::base::ironic
+
+ if $step >= 4 {
+ include ::ironic::drivers::deploy
+ include ::ironic::drivers::ipmi
+ include ::ironic::drivers::pxe
+ include ::ironic::conductor
+ }
+}
diff --git a/manifests/profile/base/neutron/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index d18638e..04c6244 100644
--- a/manifests/profile/base/neutron/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
-# == Class: tripleo::profile::base::neutron::ml2
+# == Class: tripleo::profile::base::neutron::plugins::ml2
#
-# Neutron ML2 driver profile for tripleo
+# Neutron ML2 plugin profile for tripleo
#
# === Parameters
#
@@ -31,15 +31,16 @@
# for more details.
# Defaults to hiera('step')
#
-class tripleo::profile::base::neutron::ml2 (
+class tripleo::profile::base::neutron::plugins::ml2 (
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
$sync_db = true,
$step = hiera('step'),
) {
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::ml2
- include ::tripleo::profile::base::neutron
if 'cisco_n1kv' in $mechanism_drivers {
include ::tripleo::profile::base::neutron::n1k
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index 20f93db..5d3661e 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -29,6 +29,9 @@ class tripleo::profile::base::neutron::plugins::nuage (
$step = hiera('step'),
$sync_db = true,
) {
+
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::nuage
}
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index 1fcb627..96d7421 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -29,6 +29,9 @@ class tripleo::profile::base::neutron::plugins::opencontrail (
$step = hiera('step'),
$sync_db = true,
) {
+
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::opencontrail
}
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index 7f645b9..f5cd273 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -31,6 +31,9 @@ class tripleo::profile::base::neutron::plugins::plumgrid (
$step = hiera('step'),
$sync_db = true,
) {
+
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::plumgrid
}
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 320f83c..8b5539e 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -29,7 +29,7 @@ class tripleo::profile::base::neutron::server (
include ::tripleo::profile::base::neutron
- if $step >= 2 {
+ if $step >= 3 {
include ::neutron::db::mysql
}
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index 66f0d7d..52a4c73 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -22,8 +22,23 @@
# (Optional) The current step of the deployment
# Defaults to hiera('step')
#
+# [*manage_migration*]
+# (Optional) Whether or not manage Nova Live migration
+# Defaults to false
+#
+# [*libvirt_enabled*]
+# (Optional) Whether or not Libvirt is enabled.
+# Defaults to false
+#
+# [*nova_compute_enabled*]
+# (Optional) Whether or not nova-compute is enabled.
+# Defaults to false
+#
class tripleo::profile::base::nova (
- $step = hiera('step'),
+ $step = hiera('step'),
+ $manage_migration = false,
+ $libvirt_enabled = false,
+ $nova_compute_enabled = false,
) {
if hiera('nova::use_ipv6', false) {
@@ -41,4 +56,14 @@ class tripleo::profile::base::nova (
}
include ::nova::config
}
+
+ if $step >= 4 {
+ if $manage_migration {
+ class { '::nova::migration::libvirt':
+ configure_libvirt => $libvirt_enabled,
+ configure_nova => $nova_compute_enabled,
+ }
+ }
+ }
+
}
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 4064b1e..3b36c57 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -34,10 +34,9 @@ class tripleo::profile::base::nova::api (
include ::tripleo::profile::base::nova
- if $step >= 2 and $sync_db {
+ if $step >= 3 and $sync_db {
include ::nova::db::mysql
include ::nova::db::mysql_api
- Exec<| title == 'galera-ready'|> -> Anchor['nova::db::begin']
}
if $step >= 4 or ($step >= 3 and $sync_db) {
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index 579b474..16b61df 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -23,8 +23,13 @@
# for more details.
# Defaults to hiera('step')
#
+# [*cinder_nfs_backend*]
+# (Optional) Whether or not Cinder is backed by NFS.
+# Defaults to hiera('cinder_enable_nfs_backend', false)
+#
class tripleo::profile::base::nova::compute (
- $step = hiera('step'),
+ $step = hiera('step'),
+ $cinder_nfs_backend = hiera('cinder_enable_nfs_backend', false),
) {
if $step >= 4 {
@@ -38,4 +43,17 @@ class tripleo::profile::base::nova::compute (
include ::nova::network::neutron
}
+ # If NFS is used as a Cinder backend
+ if $cinder_nfs_backend {
+ ensure_packages('nfs-utils', { ensure => present })
+ Package['nfs-utils'] -> Service['nova-compute']
+ if str2bool($::selinux) {
+ selboolean { 'virt_use_nfs':
+ value => on,
+ persistent => true,
+ }
+ Selboolean['virt_use_nfs'] -> Package['nfs-utils']
+ }
+ }
+
}
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index 74af7fc..5b6f895 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -35,7 +35,7 @@ class tripleo::profile::base::nova::compute::libvirt (
$rbd_persistent_storage = hiera('rbd_persistent_storage', false)
if $rbd_ephemeral_storage or $rbd_persistent_storage {
$client_keys = hiera('ceph::profile::params::client_keys')
- $client_user = join(['client.', hiera('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name')])
+ $client_user = join(['client.', hiera('nova::compute::rbd::libvirt_rbd_user')])
class { '::nova::compute::rbd':
libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
}
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
new file mode 100644
index 0000000..371cb0d
--- /dev/null
+++ b/manifests/profile/base/swift/storage.pp
@@ -0,0 +1,52 @@
+# 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::swift::storage
+#
+# Swift storage profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+# [*enable_swift_storage*]
+# (Optional) enable_swift_storage
+# Deprecated: defaults to true
+#
+class tripleo::profile::base::swift::storage (
+ $step = hiera('step'),
+ # Deprecated conditional to support ControllerEnableSwiftStorage parameter
+ $enable_swift_storage = true,
+) {
+
+ if $step >= 4 {
+ if $enable_swift_storage {
+ include ::swift::storage::all
+ if(!defined(File['/srv/node'])) {
+ file { '/srv/node':
+ ensure => directory,
+ owner => 'swift',
+ group => 'swift',
+ require => Package['openstack-swift'],
+ }
+ }
+ $swift_components = ['account', 'container', 'object']
+ swift::storage::filter::recon { $swift_components : }
+ swift::storage::filter::healthcheck { $swift_components : }
+ }
+ }
+}
diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp
index 497d6f3..46a40db 100644
--- a/manifests/profile/pacemaker/keystone.pp
+++ b/manifests/profile/pacemaker/keystone.pp
@@ -46,15 +46,9 @@ class tripleo::profile::pacemaker::keystone (
if $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
- } else {
- $pacemaker_master = false
- }
-
- if $step >= 5 and $pacemaker_master {
$manage_roles = true
- Pacemaker::Resource::Service[$::apache::params::service_name] -> Class['::keystone::roles::admin']
- Pacemaker::Resource::Service[$::apache::params::service_name] -> Class['::keystone::endpoint']
} else {
+ $pacemaker_master = false
$manage_roles = false
}
diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp
index 2af53dc..fff731d 100644
--- a/manifests/profile/pacemaker/neutron.pp
+++ b/manifests/profile/pacemaker/neutron.pp
@@ -24,7 +24,7 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
# [*enable_l3*]
# (Optional) Whether to include the Neutron L3 agent pacemaker profile
@@ -44,7 +44,7 @@
#
class tripleo::profile::pacemaker::neutron (
$step = hiera('step'),
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
# We can drop the hiera defaults once the neutron roles are decomposed
$enable_l3 = hiera('neutron::enable_l3_agent', false),
$enable_dhcp = hiera('neutron::enable_dhcp_agent', false),
diff --git a/manifests/profile/pacemaker/neutron/dhcp.pp b/manifests/profile/pacemaker/neutron/dhcp.pp
index 1f3b178..d738f21 100644
--- a/manifests/profile/pacemaker/neutron/dhcp.pp
+++ b/manifests/profile/pacemaker/neutron/dhcp.pp
@@ -25,11 +25,11 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
class tripleo::profile::pacemaker::neutron::dhcp (
$step = hiera('step'),
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/l3.pp b/manifests/profile/pacemaker/neutron/l3.pp
index e1699cc..fec4af2 100644
--- a/manifests/profile/pacemaker/neutron/l3.pp
+++ b/manifests/profile/pacemaker/neutron/l3.pp
@@ -25,11 +25,11 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
class tripleo::profile::pacemaker::neutron::l3 (
$step = hiera('step'),
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp
index e6bccb1..4fccea2 100644
--- a/manifests/profile/pacemaker/neutron/metadata.pp
+++ b/manifests/profile/pacemaker/neutron/metadata.pp
@@ -25,11 +25,11 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
class tripleo::profile::pacemaker::neutron::metadata (
$step = hiera('step'),
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/midonet.pp b/manifests/profile/pacemaker/neutron/midonet.pp
index a4ec831..9d380f0 100644
--- a/manifests/profile/pacemaker/neutron/midonet.pp
+++ b/manifests/profile/pacemaker/neutron/midonet.pp
@@ -25,11 +25,11 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
class tripleo::profile::pacemaker::neutron::midonet (
$step = hiera('step'),
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
diff --git a/manifests/profile/pacemaker/neutron/ovs.pp b/manifests/profile/pacemaker/neutron/ovs.pp
index 34ff5d3..a330de1 100644
--- a/manifests/profile/pacemaker/neutron/ovs.pp
+++ b/manifests/profile/pacemaker/neutron/ovs.pp
@@ -25,11 +25,11 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
class tripleo::profile::pacemaker::neutron::ovs (
$step = hiera('step'),
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
include ::neutron::params
diff --git a/manifests/profile/pacemaker/neutron/ml2.pp b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
index 8acaf21..6c9d8b1 100644
--- a/manifests/profile/pacemaker/neutron/ml2.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
#
-# == Class: tripleo::profile::pacemaker::neutron::ml2
+# == Class: tripleo::profile::pacemaker::neutron::plugins::ml2
#
# Neutron ML2 driver Pacemaker HA profile for tripleo
#
@@ -20,16 +20,16 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
-class tripleo::profile::pacemaker::neutron::ml2 (
- $pacemaker_master = hiera('bootstrap_nodeid'),
+class tripleo::profile::pacemaker::neutron::plugins::ml2 (
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
- class { '::tripleo::profile::base::neutron::ml2':
+ class { '::tripleo::profile::base::neutron::plugins::ml2':
sync_db => ($::hostname == downcase($pacemaker_master))
}
diff --git a/manifests/profile/pacemaker/neutron/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
index 6b38884..ea40d38 100644
--- a/manifests/profile/pacemaker/neutron/plugins/nuage.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp
@@ -20,10 +20,10 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
class tripleo::profile::pacemaker::neutron::plugins::nuage (
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
class { '::tripleo::profile::base::neutron::plugins::nuage':
diff --git a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
index 32564f4..8db3cb2 100644
--- a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp
@@ -20,10 +20,10 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
class tripleo::profile::pacemaker::neutron::plugins::opencontrail (
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
class { '::tripleo::profile::base::neutron::plugins::opencontrail':
diff --git a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
index 1f2b32a..57f9e31 100644
--- a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp
@@ -20,10 +20,10 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
class tripleo::profile::pacemaker::neutron::plugins::plumgrid (
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
) {
class { '::tripleo::profile::base::neutron::plugins::plumgrid':
diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index 0bad1b9..acd7993 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -20,7 +20,7 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::neutron::server (
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
$step = hiera('step'),
) {
@@ -36,9 +36,8 @@ class tripleo::profile::pacemaker::neutron::server (
include ::tripleo::profile::pacemaker::neutron
$sync_db = ($::hostname == downcase($pacemaker_master))
- if $step >= 2 and $sync_db {
+ if $step >= 3 and $sync_db {
include ::neutron::db::mysql
- Exec<| title == 'galera-ready'|> -> Class['neutron::db::mysql']
}
if $step >= 4 or ( $step >= 3 and $sync_db ) {