commit 4fbe6b81a85e694656a263c54191dfc744e8a855
author Ondrej Smola <ondrej.smola@tcpcloud.eu> Tue Aug 22 14:18:42 2017 +0000
committer Gerrit Code Review <gerrit2@7fdf03a22773> Tue Aug 22 14:18:45 2017 +0000
tree 9045fd474985bb79b04de156ec13216b0e36dab2
parent 4a86f7f6539ffe04bc266bb22339ef7fd22d3a4a
parent d571c86e8aae549375176f2e584a18f82d3c54fe

Merge "remove devel formula, add crush param"

classes/cluster/ceph_ha/infra/config.yml

diff --git a/classes/cluster/ceph_ha/infra/config.yml b/classes/cluster/ceph_ha/infra/config.yml
index d46d208..806bbce 100644
--- a/classes/cluster/ceph_ha/infra/config.yml
+++ b/classes/cluster/ceph_ha/infra/config.yml
@@ -22,19 +22,6 @@
     salt_master_host: 127.0.0.1
   salt:
     master:
-      environment:
-        prd:
-          formula:
-            ceph:
-              source: git
-              address: 'https://github.com/LotharKAtt/salt-formula-ceph.git'
-              revision: master
-        dev:
-          formula:
-            ceph:
-              source: git
-              address: 'https://github.com/LotharKAtt/salt-formula-ceph.git'
-              revision: master
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
@@ -54,6 +41,9 @@
               ceph_host_id:
                 value: <<count>>
                 start: 1
+              ceph_crush_parent:
+                value: rack<<count>>
+                start: 1
               # single_address:
               #   value: ceph_osd_node<<count>>_address
               #   start: 1