summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-18 09:52:16 +0000
committerGerrit Code Review <review@openstack.org>2016-05-18 09:52:16 +0000
commit93eeb887a7bae59c43c9e864c20d3c844592f68b (patch)
tree95f13fce2bc632a2d2c3f49eada534a24dfbfed8
parenta555a26421deda2f601e2127a9ecaf0b4590a11f (diff)
parent837643416d6fc636336d74b1da800a295c3d49a3 (diff)
Merge "Remove manage_service and enabled from TripleO manifests"
-rw-r--r--manifests/profile/base/glance/api.pp13
-rw-r--r--manifests/profile/base/glance/registry.pp13
-rw-r--r--manifests/profile/base/keystone.pp12
-rw-r--r--manifests/profile/base/neutron/dhcp.pp15
-rw-r--r--manifests/profile/base/neutron/l3.pp15
-rw-r--r--manifests/profile/base/neutron/metadata.pp15
-rw-r--r--manifests/profile/base/neutron/ovs.pp15
-rw-r--r--manifests/profile/base/neutron/server.pp12
-rw-r--r--manifests/profile/pacemaker/glance.pp7
-rw-r--r--manifests/profile/pacemaker/keystone.pp2
-rw-r--r--manifests/profile/pacemaker/neutron/dhcp.pp5
-rw-r--r--manifests/profile/pacemaker/neutron/l3.pp5
-rw-r--r--manifests/profile/pacemaker/neutron/metadata.pp5
-rw-r--r--manifests/profile/pacemaker/neutron/ovs.pp6
-rw-r--r--manifests/profile/pacemaker/neutron/server.pp2
15 files changed, 9 insertions, 133 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 5d51e5e..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,
}
diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp
index 4d5bb28..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,16 +29,11 @@
#
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,
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/pacemaker/glance.pp b/manifests/profile/pacemaker/glance.pp
index 4dca67e..10f4f03 100644
--- a/manifests/profile/pacemaker/glance.pp
+++ b/manifests/profile/pacemaker/glance.pp
@@ -75,14 +75,9 @@ class tripleo::profile::pacemaker::glance (
$pacemaker_master = false
}
- class { '::tripleo::profile::base::glance::api':
- manage_service => false,
- enabled => false,
- }
+ include ::tripleo::profile::base::glance::api
class { '::tripleo::profile::base::glance::registry':
sync_db => $pacemaker_master,
- manage_service => false,
- enabled => false,
}
if $step >= 4 {
diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp
index 712d58d..42c44d4 100644
--- a/manifests/profile/pacemaker/keystone.pp
+++ b/manifests/profile/pacemaker/keystone.pp
@@ -60,8 +60,6 @@ class tripleo::profile::pacemaker::keystone (
class { '::tripleo::profile::base::keystone':
sync_db => $pacemaker_master,
- manage_service => false,
- enabled => false,
bootstrap_master => $pacemaker_master,
manage_roles => $manage_roles,
manage_endpoint => $manage_roles
diff --git a/manifests/profile/pacemaker/neutron/dhcp.pp b/manifests/profile/pacemaker/neutron/dhcp.pp
index 841d225..1f3b178 100644
--- a/manifests/profile/pacemaker/neutron/dhcp.pp
+++ b/manifests/profile/pacemaker/neutron/dhcp.pp
@@ -34,11 +34,8 @@ class tripleo::profile::pacemaker::neutron::dhcp (
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
+ include ::tripleo::profile::base::neutron::dhcp
- class { '::tripleo::profile::base::neutron::dhcp':
- manage_service => false,
- enabled => false,
- }
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::neutron::params::dhcp_agent_service:
clone_params => 'interleave=true',
diff --git a/manifests/profile/pacemaker/neutron/l3.pp b/manifests/profile/pacemaker/neutron/l3.pp
index a900016..e1699cc 100644
--- a/manifests/profile/pacemaker/neutron/l3.pp
+++ b/manifests/profile/pacemaker/neutron/l3.pp
@@ -34,11 +34,8 @@ class tripleo::profile::pacemaker::neutron::l3 (
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
+ include ::tripleo::profile::base::neutron::l3
- class { '::tripleo::profile::base::neutron::l3':
- manage_service => false,
- enabled => false,
- }
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::neutron::params::l3_agent_service:
clone_params => 'interleave=true',
diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp
index 4030bb2..e6bccb1 100644
--- a/manifests/profile/pacemaker/neutron/metadata.pp
+++ b/manifests/profile/pacemaker/neutron/metadata.pp
@@ -34,11 +34,8 @@ class tripleo::profile::pacemaker::neutron::metadata (
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
+ include ::tripleo::profile::base::neutron::metadata
- class { '::tripleo::profile::base::neutron::metadata':
- manage_service => false,
- enabled => false,
- }
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
pacemaker::resource::service { $::neutron::params::metadata_agent_service:
clone_params => 'interleave=true',
diff --git a/manifests/profile/pacemaker/neutron/ovs.pp b/manifests/profile/pacemaker/neutron/ovs.pp
index c3ce36e..34ff5d3 100644
--- a/manifests/profile/pacemaker/neutron/ovs.pp
+++ b/manifests/profile/pacemaker/neutron/ovs.pp
@@ -34,11 +34,7 @@ class tripleo::profile::pacemaker::neutron::ovs (
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
-
- class { '::tripleo::profile::base::neutron::ovs':
- manage_service => false,
- enabled => false,
- }
+ include ::tripleo::profile::base::neutron::ovs
if $step >= 5 and downcase($::hostname) == $pacemaker_master {
diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp
index 4ff2e88..83e8a2a 100644
--- a/manifests/profile/pacemaker/neutron/server.pp
+++ b/manifests/profile/pacemaker/neutron/server.pp
@@ -38,8 +38,6 @@ class tripleo::profile::pacemaker::neutron::server (
class { '::tripleo::profile::base::neutron::server':
sync_db => ($::hostname == downcase($pacemaker_master)),
- manage_service => false,
- enabled => false,
}
if ($::hostname == downcase($pacemaker_master)) {