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 "etcd: Get FQDN from hiera instead of puppet fact"
[apex-tripleo-heat-templates.git]
/
capabilities-map.yaml
diff --git
a/capabilities-map.yaml
b/capabilities-map.yaml
index
cc22ff9
..
3028dcf
100644
(file)
--- a/
capabilities-map.yaml
+++ b/
capabilities-map.yaml
@@
-335,11
+335,6
@@
topics:
description: Enables Neutron Nuage backend on the controller
requires:
- overcloud-resource-registry-puppet.yaml
description: Enables Neutron Nuage backend on the controller
requires:
- overcloud-resource-registry-puppet.yaml
- - file: environments/neutron-opencontrail.yaml
- title: OpenContrail Extensions
- description: Enables OpenContrail extensions
- requires:
- - overcloud-resource-registry-puppet.yaml
- file: environments/neutron-opendaylight.yaml
title: OpenDaylight
description: Enables OpenDaylight
- file: environments/neutron-opendaylight.yaml
title: OpenDaylight
description: Enables OpenDaylight