added fixes for ceph lab

Change-Id: I9c62d4f32b8c442e398babf7a7808a9ab1814497
diff --git a/classes/cluster/ceph_ha/ceph/init.yml b/classes/cluster/ceph_ha/ceph/init.yml
index 553ee24..815933d 100644
--- a/classes/cluster/ceph_ha/ceph/init.yml
+++ b/classes/cluster/ceph_ha/ceph/init.yml
@@ -8,10 +8,7 @@
     ceph_mon_node01_hostname: cmn01
     ceph_mon_node02_hostname: cmn02
     ceph_mon_node03_hostname: cmn03
-    ceph_mon_node01_address: ${_param:ceph_mon_node01_address}
-    ceph_mon_node02_address: ${_param:ceph_mon_node02_address}
-    ceph_mon_node03_address: ${_param:ceph_mon_node03_address}
-
+    
     ceph_osd_node01_hostname: osd01
     ceph_osd_node02_hostname: osd02
     ceph_osd_node03_hostname: osd03
diff --git a/classes/cluster/ceph_ha/ceph/osd.yml b/classes/cluster/ceph_ha/ceph/osd.yml
index a09fc8e..a01c57e 100644
--- a/classes/cluster/ceph_ha/ceph/osd.yml
+++ b/classes/cluster/ceph_ha/ceph/osd.yml
@@ -32,7 +32,7 @@
   linux:
    storage:
      disk:
-       first_drive:
+       disk01:
          name: /dev/vdb
          type: gpt
          partitions:
@@ -40,7 +40,8 @@
            type: xfs
          - size: 6000
            type: xfs
-       second_drive:
+           mkfs: true
+       disk02:
          name: /dev/vdc
          type: gpt
          partitions:
@@ -48,7 +49,8 @@
            type: xfs
          - size: 6000
            type: xfs
-       third_drive:
+           mkfs: true
+       disk03:
          name: /dev/vdd
          type: gpt
          partitions:
@@ -56,3 +58,4 @@
            type: xfs
          - size: 6000
            type: xfs
+           mkfs: true
diff --git a/classes/cluster/ceph_ha/infra/config.yml b/classes/cluster/ceph_ha/infra/config.yml
index 5038d3d..d46d208 100644
--- a/classes/cluster/ceph_ha/infra/config.yml
+++ b/classes/cluster/ceph_ha/infra/config.yml
@@ -54,11 +54,11 @@
               ceph_host_id:
                 value: <<count>>
                 start: 1
-              single_address:
-                value: ceph_osd_node<<count>>_address
-                start: 1
-                digits: 2
-                interpolate: true
+              # single_address:
+              #   value: ceph_osd_node<<count>>_address
+              #   start: 1
+              #   digits: 2
+              #   interpolate: true
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial