Merge "Use custom role names in deployed-server roles"

This commit is contained in:
Jenkins 2017-01-17 15:47:19 +00:00 committed by Gerrit Code Review
commit 1ed5fbf618
1 changed files with 5 additions and 6 deletions

View File

@ -21,7 +21,7 @@
# on the role, defaults to an empty list. Sets the default for the
# {{role.name}}Services parameter in overcloud.yaml
- name: Controller
- name: ControllerDeployedServer
CountDefault: 1
disable_constraints: True
ServicesDefault:
@ -33,7 +33,6 @@
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Core
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::GlanceApi
@ -103,7 +102,7 @@
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::OVNDBs
- name: Compute
- name: ComputeDeployedServer
CountDefault: 1
HostnameFormatDefault: '%stackname%-novacompute-%index%'
disable_constraints: True
@ -129,7 +128,7 @@
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
- name: BlockStorage
- name: BlockStorageDeployedServer
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts
@ -143,7 +142,7 @@
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
- name: ObjectStorage
- name: ObjectStorageDeployedServer
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts
@ -158,7 +157,7 @@
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
- name: CephStorage
- name: CephStorageDeployedServer
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts