Merge "Wire in NodeExtraConfig interface"

diff --cc puppet/ceph-storage.yaml
Simple merge

diff --cc puppet/cinder-storage.yaml
Simple merge

diff --cc puppet/compute.yaml
Simple merge

diff --cc puppet/controller.yaml
Simple merge

diff --cc puppet/swift-storage.yaml
index f6623be,5b7c28b..22ec609
--- 1/puppet/swift-storage.yaml
--- 2/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