Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Revert "Revert "Specify cell0 db creation"""
[apex-tripleo-heat-templates.git]
/
deployed-server
/
deployed-server-roles-data.yaml
diff --git
a/deployed-server/deployed-server-roles-data.yaml
b/deployed-server/deployed-server-roles-data.yaml
index
40a1518
..
9795a00
100644
(file)
--- a/
deployed-server/deployed-server-roles-data.yaml
+++ b/
deployed-server/deployed-server-roles-data.yaml
@@
-21,7
+21,7
@@
# on the role, defaults to an empty list. Sets the default for the
# {{role.name}}Services parameter in overcloud.yaml
# on the role, defaults to an empty list. Sets the default for the
# {{role.name}}Services parameter in overcloud.yaml
-- name: Controller
+- name: Controller
DeployedServer
CountDefault: 1
disable_constraints: True
ServicesDefault:
CountDefault: 1
disable_constraints: True
ServicesDefault:
@@
-33,11
+33,9
@@
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- 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
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::GlanceApi
- - OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatApiCloudwatch
- OS::TripleO::Services::HeatApi
- OS::TripleO::Services::HeatApiCfn
- OS::TripleO::Services::HeatApiCloudwatch
@@
-59,6
+57,7
@@
- OS::TripleO::Services::MongoDb
- OS::TripleO::Services::NovaApi
- OS::TripleO::Services::NovaMetadata
- OS::TripleO::Services::MongoDb
- OS::TripleO::Services::NovaApi
- OS::TripleO::Services::NovaMetadata
+ - OS::TripleO::Services::NovaPlacement
- OS::TripleO::Services::NovaScheduler
- OS::TripleO::Services::NovaConsoleauth
- OS::TripleO::Services::NovaVncProxy
- OS::TripleO::Services::NovaScheduler
- OS::TripleO::Services::NovaConsoleauth
- OS::TripleO::Services::NovaVncProxy
@@
-103,7
+102,7
@@
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::OVNDBs
- OS::TripleO::Services::Zaqar
- OS::TripleO::Services::OVNDBs
-- name: Compute
+- name: Compute
DeployedServer
CountDefault: 1
HostnameFormatDefault: '%stackname%-novacompute-%index%'
disable_constraints: True
CountDefault: 1
HostnameFormatDefault: '%stackname%-novacompute-%index%'
disable_constraints: True
@@
-129,7
+128,7
@@
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
-- name: BlockStorage
+- name: BlockStorage
DeployedServer
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts
@@
-143,7
+142,7
@@
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
-- name: ObjectStorage
+- name: ObjectStorage
DeployedServer
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts
@@
-158,7
+157,7
@@
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::SensuClient
- OS::TripleO::Services::FluentdClient
-- name: CephStorage
+- name: CephStorage
DeployedServer
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts
disable_constraints: True
ServicesDefault:
- OS::TripleO::Services::CACerts