Преглед изворни кода

added variable for master_ip

updated host_inventry_file from INI to YAML format and included varibale for master_ip to be carried into `startmaster` playbook

Signed-off-by: John Lockman <jlockman3@gmail.com>
John Lockman пре 4 година
родитељ
комит
dc01a8510c
2 измењених фајлова са 30 додато и 23 уклоњено
  1. 27 19
      kubernetes/host_inventory_file
  2. 3 4
      kubernetes/roles/startmaster/tasks/main.yml

+ 27 - 19
kubernetes/host_inventory_file

@@ -1,20 +1,28 @@
-[master]
-friday
+all: 
+  hosts: 
+  children:
+    master:
+      hosts:
+        compute000
+      vars: 
+        master_ip: 10.0.0.100
+    compute:
+      hosts:
+        compute002:
+        compute004:
+        compute005:
+    gpus:
+      hosts:
+        compute002:
+        compute004:
+        compute005:
+    workers:
+      children:
+        compute:
+        gpu: 
+    cluster:
+      children:
+        master:
+        workers:
 
-[compute]
-compute000
-compute[002:005]
-
-[gpus]
-#compute001
-compute002
-compute004
-compute005
-
-[workers:children]
-compute
-gpus
-
-[cluster:children]
-master
-workers
+        

+ 3 - 4
kubernetes/roles/startmaster/tasks/main.yml

@@ -18,7 +18,7 @@
   tags: init
 
 - name: Initialize kubeadm
-  command: /bin/kubeadm init --pod-network-cidr=10.244.0.0/16 --apiserver-advertise-address=10.0.0.100
+  command: /bin/kubeadm init --pod-network-cidr=10.244.0.0/16 --apiserver-advertise-address={{ master_ip }}
   #command: /bin/kubeadm init 
   register: init_output 
   tags: init
@@ -52,8 +52,7 @@
     name:   "K8S_TOKEN_HOLDER"
     token:  "{{ K8S_TOKEN.stdout }}"
     hash:   "{{ K8S_MASTER_CA_HASH.stdout }}"
-    #ip:     "{{ ansible_ib0.ipv4.address }}"
-    ip:     "{{ ansible_p1p1.ipv4.address }}"
+    ip:     "{{ master_ip }}"
   tags: init
 
 - name:
@@ -68,7 +67,7 @@
 
 - name:
   debug:
-    msg: "[Master] K8S_MASTER_IP is  {{ hostvars['K8S_TOKEN_HOLDER']['ip'] }}"
+    msg: "[Master] K8S_MASTER_IP is  {{ master_ip }}"
   tags: init
 
 - name: Setup Calico SDN network