Add .gitignore

chekolyn · Jul 18, 2014 · 6629e38 · 6629e38
1 parent e25ca36
commit 6629e38
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/.vagrant
diff --git a/pillar/data/ceph.sls b/pillar/data/ceph.sls
@@ -1,8 +1,8 @@
 ceph:
   global:
     fsid: 294bc494-81ba-4c3c-ac5d-af7b3442a2a5
-    public_network: 10.0.2.0/24
-    cluster_network: 10.0.2.0/24
+    public_network: 192.168.33.0/24
+    cluster_network: 192.168.33.0/24
   client:
     rbd_cache: true
     rbd_cache_size: 134217728
@@ -17,5 +17,5 @@ ceph:
     filestore_split_multiple: 8
     op_threads: 8
   custom:
-    mon_interface: eth0
+    mon_interface: eth1
 
diff --git a/pillar/data/environment.sls b/pillar/data/environment.sls
@@ -1,10 +1,15 @@
 nodes:
-  vagrant-ubuntu-trusty-64:
+  minion01:
     roles:
       - ceph-osd
       - ceph-mon
     devs:
       sdb:
-        journal: sdd
-      sdc:
-        journal: sdd
+        journal: sdc
+  minion02:
+    roles:
+      - ceph-osd
+      - ceph-mon
+    devs:
+      sdb:
+        journal: sdc
diff --git a/salt/orchestration/ceph.sls b/salt/orchestration/ceph.sls
@@ -7,7 +7,7 @@ assign_roles:
 
 first_mon_setup:
   salt.state:
-    - tgt: 'vagrant-ubuntu-trusty-64*'
+    - tgt: 'minion01*'
     - sls: ceph.mon
     - require:
       - salt: assign_roles