Docs etc

2025-11-01 22:34:14 +00:00 · 2015-11-22 16:06:04 -08:00
parent 321bc73264
commit ad2d3d4c20
12 changed files with 177 additions and 73 deletions
--- a/cluster/saltbase/salt/flannel-server/init.sls
+++ b/cluster/saltbase/salt/flannel-server/init.sls
@@ -8,7 +8,7 @@ touch /var/log/etcd_flannel.log:

 /etc/kubernetes/network.json:
  file.managed:
-    - source: salt://flannel/network.json
+    - source: salt://flannel-server/network.json
    - makedirs: True
    - user: root
    - group: root
--- a/cluster/saltbase/salt/flannel/network.json
+++ b/cluster/saltbase/salt/flannel/network.json
@@ -1,8 +0,0 @@
-{
-    "Network": "18.16.0.0/16",
-    "SubnetLen": 24,
-    "Backend": {
-        "Type": "vxlan",
-        "VNI": 1
-     }
-}
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -14,9 +14,6 @@ base:
    - match: grain
    - docker
    - flannel
-{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
-    - openvpn-client
-{% endif %}
    - helpers
    - cadvisor
    - kube-client-tools