diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-19 18:38:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-19 18:38:18 +0000 |
| commit | 8eaecb64893ff7ebeaca14eb5172e3320202343b (patch) | |
| tree | 62e52a91b02419de1e9c133ca23fc9ab4890c852 | |
| parent | 56c8f120770b63b5518d3738ed56de626d24eb80 (diff) | |
| parent | 3e6147dee4497bbb607e6377bd588e32f62be2b7 (diff) | |
Merge "Remove root_template and root_environment from capabilities-map.yaml"
| -rw-r--r-- | capabilities-map.yaml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/capabilities-map.yaml b/capabilities-map.yaml index 0af0e822..e510d679 100644 --- a/capabilities-map.yaml +++ b/capabilities-map.yaml @@ -2,12 +2,6 @@ # repository for deployment using puppet. It groups configuration by topic, # describes possible combinations of environments and resource capabilities. -# root_template: identifies repository's root template -# root_environment: identifies root_environment, this one is special in terms of -# order in which the environments are merged before deploying. This one serves as -# a base and it's parameters/resource_registry gets overridden by other environments -# if used. - # topics: # High Level grouping by purpose of environments # Attributes: @@ -38,8 +32,6 @@ # only when that given environment is used. (resource_type of that environment can # be implemented using multiple templates). -root_template: overcloud.yaml -root_environment: overcloud-resource-registry-puppet.yaml topics: - title: Base Resources Configuration description: |