Browse Source

removed hard-coded IP

Signed-off-by: John lockman <john.lockman@friday.local>
John lockman 4 years ago
parent
commit
a522fc97a5
3 changed files with 12 additions and 18 deletions
  1. 3 3
      omnia.yml
  2. 9 13
      roles/startmanager/tasks/main.yml
  3. 0 2
      roles/startmanager/vars/main.yml

+ 3 - 3
omnia.yml

@@ -29,10 +29,10 @@
   gather_facts: false
   roles:
     - compute_gpu
- 
+
 - name: Apply K8s manager config
   hosts: manager
-  gather_facts: false
+  gather_facts: true
   roles:
     - manager
 
@@ -44,7 +44,7 @@
 
 - name: Start K8s on manager server
   hosts: manager
-  gather_facts: false
+  gather_facts: true
   roles:
     - startmanager
 

+ 9 - 13
roles/startmanager/tasks/main.yml

@@ -13,21 +13,17 @@
 #  limitations under the License.
 ---
 
-- name: Disable swap (if not already disabled)
+- name: Disable swap
   command: /usr/sbin/swapoff -a
   changed_when: true
   tags: init
 
-- name: Start and enable docker service
-  systemd:
-    name: docker
-    state: started
-    enabled: yes
-    daemon_reload: yes
-  tags: docker
+- name: Get netaddr
+  setup:
+    filter: ansible_default_ipv4.address
 
 - name: Initialize kubeadm
-  command: "/bin/kubeadm init --pod-network-cidr='{{ pod_network_cidr_ip }}' --apiserver-advertise-address='{{ manager_ip }}'"
+  command: "/bin/kubeadm init --pod-network-cidr='{{ pod_network_cidr_ip }}' --apiserver-advertise-address='{{ ansible_default_ipv4.address }}'"
   changed_when: true
   register: init_output
   tags: init
@@ -77,7 +73,7 @@
     name:   "K8S_TOKEN_HOLDER"
     token:  "{{ K8S_TOKEN.stdout }}"
     hash:   "{{ K8S_MANAGER_CA_HASH.stdout }}"
-    ip:     "{{ manager_ip }}"
+    ip:     "{{ ansible_default_ipv4.address }}"
   tags: init
 
 - name: Print k8s token
@@ -92,9 +88,9 @@
     verbosity: 2
   tags: init
 
-- name: Print k8s manager_ip
+- name: Print k8s ansible_default_ipv4.address
   debug:
-    msg: "[Manager] K8S_MANAGER_IP is  {{ manager_ip }}"
+    msg: "[Manager] K8S_MANAGER_IP is  {{ ansible_default_ipv4.address }}"
     verbosity: 2
   tags: init
 
@@ -153,4 +149,4 @@
 - name: Edge / Workstation Install allows pods to scheudle on manager
   command: kubectl taint nodes --all node-role.kubernetes.io/master-
   when: single_node
-  tags: init
+  tags: init

+ 0 - 2
roles/startmanager/vars/main.yml

@@ -15,8 +15,6 @@
 
 single_node: false
 
-manager_ip: 10.0.0.101
-
 k8s_cni: calico
 
 pod_network_cidr_ip: 10.244.0.0/16