diff --git a/deploy/kube-templates/deploy-heketi-deployment.yaml b/deploy/kube-templates/deploy-heketi-deployment.yaml index 94f2cf7d..7ff7ca3e 100644 --- a/deploy/kube-templates/deploy-heketi-deployment.yaml +++ b/deploy/kube-templates/deploy-heketi-deployment.yaml @@ -1,21 +1,4 @@ --- -kind: Service -apiVersion: v1 -metadata: - name: deploy-heketi - labels: - glusterfs: heketi-service - deploy-heketi: service - annotations: - description: Exposes Heketi Service -spec: - selector: - deploy-heketi: pod - ports: - - name: deploy-heketi - port: 8080 - targetPort: 8080 ---- kind: Deployment apiVersion: extensions/v1beta1 metadata: @@ -78,3 +61,20 @@ spec: - name: config secret: secretName: heketi-config-secret +--- +kind: Service +apiVersion: v1 +metadata: + name: deploy-heketi + labels: + glusterfs: heketi-service + deploy-heketi: service + annotations: + description: Exposes Heketi Service +spec: + selector: + deploy-heketi: pod + ports: + - name: deploy-heketi + port: 8080 + targetPort: 8080 diff --git a/deploy/kube-templates/heketi-deployment.yaml b/deploy/kube-templates/heketi-deployment.yaml index ecc6cefa..e7d4f378 100644 --- a/deploy/kube-templates/heketi-deployment.yaml +++ b/deploy/kube-templates/heketi-deployment.yaml @@ -1,21 +1,4 @@ --- -kind: Service -apiVersion: v1 -metadata: - name: heketi - labels: - glusterfs: heketi-service - heketi: service - annotations: - description: Exposes Heketi Service -spec: - selector: - glusterfs: heketi-pod - ports: - - name: heketi - port: 8080 - targetPort: 8080 ---- kind: Deployment apiVersion: extensions/v1beta1 metadata: @@ -81,3 +64,20 @@ spec: - name: config secret: secretName: heketi-config-secret +--- +kind: Service +apiVersion: v1 +metadata: + name: heketi + labels: + glusterfs: heketi-service + heketi: service + annotations: + description: Exposes Heketi Service +spec: + selector: + glusterfs: heketi-pod + ports: + - name: heketi + port: 8080 + targetPort: 8080 diff --git a/vagrant/roles/master/tasks/main.yml b/vagrant/roles/master/tasks/main.yml index edb7098c..81409fdb 100644 --- a/vagrant/roles/master/tasks/main.yml +++ b/vagrant/roles/master/tasks/main.yml @@ -31,7 +31,7 @@ - block: - name: kubeadm init - command: kubeadm init --skip-preflight-checks --token={{ kubernetes_token }} --kubernetes-version=v{{ kube_ver.stdout }} --apiserver-advertise-address={{ ansible_eth1.ipv4.address }} + command: kubeadm init --token={{ kubernetes_token }} --kubernetes-version=v{{ kube_ver.stdout }} --apiserver-advertise-address={{ ansible_eth1.ipv4.address }} - name: create root kube dir file: