Fix gluster manifests/change insecure ip for cluster
diff --git a/kubernetes/files/manifest/glusterfs-endpoints.manifest b/kubernetes/files/glusterfs/glusterfs-endpoints.yml
similarity index 67%
rename from kubernetes/files/manifest/glusterfs-endpoints.manifest
rename to kubernetes/files/glusterfs/glusterfs-endpoints.yml
index 39ef763..15d9cc9 100644
--- a/kubernetes/files/manifest/glusterfs-endpoints.manifest
+++ b/kubernetes/files/glusterfs/glusterfs-endpoints.yml
@@ -3,10 +3,10 @@
kind: Endpoints
metadata:
name: glusterfs-cluster
-subnets:
+subsets:
{%- for member in master.storage.members %}
- addresses:
- ip: {{ member.host }}
- ports:
- port: {{ member.port }}
+- addresses:
+ - ip: {{ member.host }}
+ ports:
+ - port: {{ member.port }}
{%- endfor %}
\ No newline at end of file
diff --git a/kubernetes/files/manifest/glusterfs-svc.manifest b/kubernetes/files/glusterfs/glusterfs-svc.yml
similarity index 79%
rename from kubernetes/files/manifest/glusterfs-svc.manifest
rename to kubernetes/files/glusterfs/glusterfs-svc.yml
index 5775a84..d8c34fa 100644
--- a/kubernetes/files/manifest/glusterfs-svc.manifest
+++ b/kubernetes/files/glusterfs/glusterfs-svc.yml
@@ -5,4 +5,4 @@
name: glusterfs-cluster
spec:
ports:
- port: {{ master.storage.port }}
\ No newline at end of file
+ - port: {{ master.storage.port }}
\ No newline at end of file
diff --git a/kubernetes/master/glusterfs.sls b/kubernetes/master/glusterfs.sls
index d4f7baa..8a94c14 100644
--- a/kubernetes/master/glusterfs.sls
+++ b/kubernetes/master/glusterfs.sls
@@ -1,18 +1,18 @@
{%- from "kubernetes/map.jinja" import master with context %}
{%- if master.enabled %}
-/etc/kubernetes/glusterfs/glusterfs-endpoints.manifest:
+/etc/kubernetes/glusterfs/glusterfs-endpoints.yml:
file.managed:
- - source: salt://kubernetes/files/manifest/glusterfs-endpoints.manifest
+ - source: salt://kubernetes/files/glusterfs/glusterfs-endpoints.yml
- makedirs: True
- user: root
- group: root
- mode: 644
- template: jinja
-/etc/kubernetes/glusterfs/glusterfs-svc.manifest:
+/etc/kubernetes/glusterfs/glusterfs-svc.yml:
file.managed:
- - source: salt://kubernetes/files/manifest/glusterfs-svc.manifest
+ - source: salt://kubernetes/files/glusterfs/glusterfs-svc.yml
- makedirs: True
- user: root
- group: root
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index fceafb9..fb4efd5 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -18,7 +18,7 @@
allow_privileged: True
apiserver:
address: ${_param:cluster_local_address}
- insecure_address: 0.0.0.0
+ insecure_address: ${_param:cluster_local_address}
etcd:
host: ${_param:cluster_local_address}
registry: quay.io/coreos