From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 9 Oct 2015 08:56:59 +0000 (+0000)
Subject: Merge "Wire in NodeExtraConfig interface"
X-Git-Tag: opnfv-6.0.0~2361
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2657c78dc44684b6e881fa0598897a4f1bce5b6c;p=apex-tripleo-heat-templates.git

Merge "Wire in NodeExtraConfig interface"
---

2657c78dc44684b6e881fa0598897a4f1bce5b6c
diff --cc puppet/swift-storage.yaml
index f6623be6,5b7c28bf..22ec6096
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@@ -213,9 -212,16 +213,17 @@@ resources
              params:
                server: {get_param: NtpServer}
          enable_package_install: {get_param: EnablePackageInstall}
 +        enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
          swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
  
+   # Hook for site-specific additional pre-deployment config,
+   # applying to all nodes, e.g node registration/unregistration
+   NodeExtraConfig:
+     depends_on: SwiftStorageHieraDeploy
+     type: OS::TripleO::NodeExtraConfig
+     properties:
+         server: {get_resource: SwiftStorage}
+ 
    UpdateConfig:
      type: OS::TripleO::Tasks::PackageUpdate