X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ceph-storage.yaml;h=0dbcd3e7c83b18a0ff9e3265f18394d5b80c94dc;hb=1a336269c8b07b5d2cbf6c15cdd3a8b302421c45;hp=15092baee4db93e638422c791204deec6f0034c9;hpb=7852f5da56a0a1d7b4ce2bf6f46d70700ffeea82;p=apex-tripleo-heat-templates.git

diff --git a/ceph-storage.yaml b/ceph-storage.yaml
index 15092bae..0dbcd3e7 100644
--- a/ceph-storage.yaml
+++ b/ceph-storage.yaml
@@ -42,6 +42,18 @@ parameters:
   Hostname:
     type: string
     default: '' # Defaults to Heat created hostname
+  ExtraConfig:
+    default: {}
+    description: |
+      Additional configuration to inject into the cluster. Note
+      that CephStorageExtraConfig takes precedence over ExtraConfig.
+    type: json
+  CephStorageExtraConfig:
+    default: {}
+    description: |
+      Role specific additional configuration to inject into the cluster.
+    type: json
+
 
 resources:
   CephStorage:
@@ -73,6 +85,7 @@ resources:
   NetworkConfig:
     type: OS::TripleO::CephStorage::Net::SoftwareConfig
     properties:
+      ControlPlaneIp: {get_attr: [CephStorage, networks, ctlplane, 0]}
       StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
       StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}