Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: f521b36 e437e10)
Merge "Add support for isolating swift storage nets"
authorJenkins <jenkins@review.openstack.org>
Tue, 16 Jun 2015 07:48:06 +0000 (07:48 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 16 Jun 2015 07:48:06 +0000 (07:48 +0000)
1  2 
overcloud-without-mergepy.yaml patch | diff1 | diff2 | blob | history

diff --combined overcloud-without-mergepy.yaml
index ad09013,224c416..97f0bd1
--- 1/overcloud-without-mergepy.yaml
--- 2/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@@ -512,7 -512,6 +512,7 @@@ parameters
        HeatApiNetwork: internal_api
        NovaApiNetwork: internal_api
        NovaMetadataNetwork: internal_api
 +      NovaVncProxyNetwork: internal_api
        SwiftMgmtNetwork: storage_mgmt
        SwiftProxyNetwork: storage
        HorizonNetwork: internal_api
@@@ -788,6 -787,7 +788,7 @@@ resources
            Replicas: { get_param: SwiftReplicas}
            NtpServer: {get_param: NtpServer}
            UpdateIdentifier: {get_param: UpdateIdentifier}
+           ServiceNetMap: {get_param: ServiceNetMap}
  
    CephStorage:
      type: OS::Heat::ResourceGroup