aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/pacemaker
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 /manifests/profile/pacemaker
parenta555a26421deda2f601e2127a9ecaf0b4590a11f (diff)
parent837643416d6fc636336d74b1da800a295c3d49a3 (diff)
Merge "Remove manage_service and enabled from TripleO manifests"
Diffstat (limited to 'manifests/profile/pacemaker')
-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
7 files changed, 5 insertions, 27 deletions
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)) {