using osarch and ceph repo update

ceph.sls

@@ -3,27 +3,34 @@
 ---
 
 ceph:
-  release: luminous 
+  release: octopus 
-  use_upstream_repo: false 
+  use_upstream_repo: true
   
   config:
     file: /etc/ceph/ceph.conf
     global:
-      fsid: 29ef4020-303a-4b2e-aa24-a1e20e5ba21c 
+      fsid: f33952a3-e074-458b-9ce8-e0e035a2f8c4 
-      authentication_type: 'cephx' #this needs some serious fixing
+      authentication_type: 'cephx'
       public_network: '192.168.10.0/24'
       cluster_network: '10.255.255.0/27'
-
+      mon_initial_members: 'pine01, pine02'
-  
+      mon_host: '[v2:192.168.10.160:3300,v1:192.168.10.160:6789], [v2:192.168.10.161:3300,v1:192.168.10.161:6789]'
-  mon_hosts:
+      mon_memory_target: 1610612736
-    - pine01.chaos
+      osd_max_backfills: 2
-    - pine02.chaos
+      osd_memory_target: 67108864
-  
+      osd_memory_base:  33554432
-  osds:
+      osd_memory_cache_min: 33554432
-    active:
+      rocksdb_cache_size: 268435456
-      - /dev/sda
+ 
-      - /dev/sdb
+#  mon_hosts:
-
+#    - pine01.chaos
-  packages:
+#    - pine02.chaos
-    - ceph
+#  
-    - apt-transport-https
+#  osds:
+#    active:
+#      - /dev/sda
+#      - /dev/sdb
+#
+#  packages:
+#    - ceph
+#    - apt-transport-https

top.sls

@@ -7,18 +7,19 @@ base:
     - saltmine
     - prometheus.node_exporter
     - base.sys.sysctl
+    - ceph
   'riot01*':
     - haproxy
     - grafana
     - prometheus.prometheus
     - base.log.rsyslog.client 
     #- kubernetes
-  'cpuarch:aarch64':
+  'osarch:arm64':
+    - match: grain
+    - base.log.rsyslog.client 
+  'osarch:armhf and not fqdn:tumor.chaos':
     - match: grain
     - base.log.rsyslog.client 
-  #'cpuarch:armv7l':
-  #  - match: grain
-  #  - base.log.rsyslog.client 
 
 #'pine03*':
   #  - prometheus.prometheus