diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-06-30 17:50:28 +0100 |
|---|---|---|
| committer |   Carlos Camacho <ccamacho@redhat.com> | 2016-08-06 10:45:31 +0200 |
| commit | 0327fc2bbb1be9972d99e2e83d54d07410ad01d9 (patch) | |
| tree | 1752ba09ea4e4b699206abac7bbe32e289c9ebb8 /puppet/services/pacemaker | |
| parent | 77cca14bd760f091a1e481bd44e96f8882fb99cc (diff) | |
Add Sahara services to ControllerServices list
https://review.openstack.org/#/c/318840/ decomposed the Sahara services
but they weren't added to the ControllerServices list, thus are now disabled.
Since we shipped mitaka with sahara enabled by default, we should probably add
them so the behavior is consistent when folks upgrade.
This also fixes a couple of issues we missed when landing the initial service
templates (partly because CI didn't test them).
In order for each service to operate independently when used with Pacemaker,
the roles needed to be separated. This commit also does this.
Depends-On: Id61eb15b1e2366f5b73c6e7d47941651e40651b1
Change-Id: I0846b328e9d938275e373d58f0b99219b19b326c
Closes-Bug: #1592284
Co-Authored-By: Brad P. Crochet <brad@redhat.com>
Diffstat (limited to 'puppet/services/pacemaker')
| -rw-r--r-- | puppet/services/pacemaker/sahara-api.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/pacemaker/sahara-engine.yaml | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/puppet/services/pacemaker/sahara-api.yaml b/puppet/services/pacemaker/sahara-api.yaml index ac05a01a..a06afb2d 100644 --- a/puppet/services/pacemaker/sahara-api.yaml +++ b/puppet/services/pacemaker/sahara-api.yaml @@ -28,4 +28,4 @@ outputs: - sahara::service::api::manage_service: false sahara::service::api::enabled: false step_config: | - include ::tripleo::profile::pacemaker::sahara + include ::tripleo::profile::pacemaker::sahara::api diff --git a/puppet/services/pacemaker/sahara-engine.yaml b/puppet/services/pacemaker/sahara-engine.yaml index f6bd8f61..a1191f87 100644 --- a/puppet/services/pacemaker/sahara-engine.yaml +++ b/puppet/services/pacemaker/sahara-engine.yaml @@ -27,7 +27,5 @@ outputs: - get_attr: [SaharaEngineBase, role_data, config_settings] - sahara::service::engine::manage_service: false sahara::service::engine::enabled: false - # No puppet manifests since sahara-engine is included in - # ::tripleo::profile::pacemaker::sahara which is maintained alongside of - # pacemaker/sahara-api.yaml. - step_config: + step_config: | + include ::tripleo::profile::pacemaker::sahara::engine |