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 "Overwrite nova placement with stub for docker"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
network
/
contrail-database.yaml
diff --git
a/puppet/services/network/contrail-database.yaml
b/puppet/services/network/contrail-database.yaml
index
c56b90a
..
b47c2c3
100644
(file)
--- a/
puppet/services/network/contrail-database.yaml
+++ b/
puppet/services/network/contrail-database.yaml
@@
-21,13
+21,6
@@
parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
- ContrailDatabaseHostIP:
- description: host IP address of Database node
- type: string
- ContrailDatabaseMinDisk:
- description: Minimum disk size for database
- type: number
- default: 64
resources:
ContrailBase:
resources:
ContrailBase:
@@
-45,7
+38,6
@@
outputs:
config_settings:
map_merge:
- get_attr: [ContrailBase, role_data, config_settings]
config_settings:
map_merge:
- get_attr: [ContrailBase, role_data, config_settings]
- - contrail::database::host_ip: {get_param: ContrailDatabaseHostIP}
- contrail::database::minimum_diskGB: {get_param: ContrailDatabaseMinDisk}
+ - contrail::database::host_ip: {get_param: [ServiceNetMap, ContrailDatabaseNetwork]}
step_config: |
step_config: |
- include ::tripleo::
profile
::contrail::database
+ include ::tripleo::
network
::contrail::database