Merge pull request #121 from dejo1307/minor_changes_and_fixes

sabrina-yee · web-flow · commit bc2c52e1f940 · 2021-05-21T07:58:30.000-04:00
Minor changes and fixes
diff --git a/playbooks/hcl/cleanup.yml b/playbooks/hcl/cleanup.yml
@@ -1,5 +1,9 @@
 # Cleanup
 ---
+- name:                    Gather facts
+  hosts:                   nfs_servers
+  tasks:                   []
+
 - name:                    Cleanup stuff
   hosts:                   k8s_masters, k8s_workers
   become:                  true
diff --git a/playbooks/hcl/cleanup/cleanup-k8s.yml b/playbooks/hcl/cleanup/cleanup-k8s.yml
@@ -1,5 +1,9 @@
 # Cleanup
 ---
+- name:                    Gather facts
+  hosts:                   nfs_servers
+  tasks:                   []
+
 - name:                    Cleanup Kubernetes
   hosts:                   k8s_masters, k8s_workers
   become:                  true
diff --git a/playbooks/third_party/was-nd-restart.yml b/playbooks/third_party/was-nd-restart.yml
@@ -25,3 +25,10 @@
   roles:
     - roles/third_party/ibm/wasnd/was-dmgr-stop-cluster
     - roles/third_party/ibm/wasnd/was-dmgr-start-cluster
+
+- name:                    Restart Docs Clusters
+  hosts:                   dmgr
+  become:                  true
+  roles:
+    - roles/hcl/docs/stop_docs_clusters
+    - roles/hcl/docs/start_docs_clusters
diff --git a/roles/hcl/cleanup/tasks/main.yml b/roles/hcl/cleanup/tasks/main.yml
@@ -1,22 +1,79 @@
-
 - name:                    Reset Kubernetes
   command:                 kubeadm reset -f
   ignore_errors:           true
   tags:                    k8s_cleanup
   when:
    - __force_destroy_kubernetes == true
 
+- name:                    Create local mount point "{{ __nfs_master_files_mount }}"
+  file:
+    path:                  "{{ __nfs_master_files_mount }}"
+    state:                 directory
+    mode:                  '0755'
+  tags:                    k8s_cleanup
+  ignore_errors:           true
+  when:
+   - inventory_hostname == groups['k8s_masters'][0]
+   - __force_destroy_kubernetes == true
+
+- name:                    Mount "{{ __nfs_master_files_dest }}" to "{{ __nfs_master_files_mount }}" first
+  mount:
+    fstype:                nfs
+    opts:                  defaults
+    dump:                  0
+    passno:                0
+    state:                 mounted
+    src:                   "{{ __nfs_master_files_dest }}"
+    path:                  "{{ __nfs_master_files_mount }}"
+  tags:                    k8s_cleanup
+  when:
+   - inventory_hostname == groups['k8s_masters'][0]
+   - __force_destroy_kubernetes == true
+
 - name:                    Cleanup K8S
   command:                 sudo yum remove kubeadm kubectl kubelet kubernetes-cni kube* -y
   ignore_errors:           true
   tags:                    k8s_cleanup
   when:
    - __force_destroy_kubernetes == true
 
+- name:                    Find kubectl
+  shell:                   "whereis kubectl | awk '{ print $2 }'"
+  register:                kubectl_loc
+  ignore_errors:           true
+  tags:                    k8s_cleanup
+  when:
+   - __force_destroy_kubernetes == true
+
+- name:                    Delete kubectl if exists {{ kubectl_loc.stdout }}
+  file:
+    path:                  "{{ kubectl_loc.stdout }}"
+    state:                 absent
+  ignore_errors:           true
+  tags:                    k8s_cleanup
+  when:
+   - __force_destroy_kubernetes == true and kubectl_loc.rc == 0
+
+- name:                    Cleanup CP NFS data
+  shell:                   "rm -rf {{ __nfs_master_files_mount }}/*/*"
+  ignore_errors:           true
+  tags:                    k8s_cleanup
+  when:
+   - inventory_hostname == groups['k8s_masters'][0]
+   - __force_destroy_kubernetes == true
+
 - name:                    Unmount /mnt/customizations
   command:                 umount -f /mnt/customizations
   tags:                    k8s_cleanup
-  when: 
+  when:
+   - inventory_hostname == groups['k8s_masters'][0]
+   - __force_destroy_kubernetes == true
+  ignore_errors:           true
+
+- name:                    Unmount {{ __nfs_master_files_mount }}
+  command:                 umount -f {{ __nfs_master_files_mount }}
+  tags:                    k8s_cleanup
+  when:
    - inventory_hostname == groups['k8s_masters'][0]
    - __force_destroy_kubernetes == true
   ignore_errors:           true
diff --git a/roles/hcl/cleanup/vars/main.yml b/roles/hcl/cleanup/vars/main.yml
@@ -4,3 +4,8 @@ __force_destroy_db2:                      "{{ force_destroy_db2 | default(false)
 __force_destroy_ihs:                      "{{ force_destroy_ihs | default(false) }}"
 __force_destroy_websphere:                "{{ force_destroy_websphere | default(false) }}"
 __force_destroy_oracle:                   "{{ force_destroy_oracle | default(false) }}"
+
+__nfsMasterAddress:                       "{{ nfsMasterAddress | default( hostvars[groups['nfs_servers'][0]]['ansible_default_ipv4']['address'] ) }}"
+__persistentVolumePath:                   "{{ persistentVolumePath | default('pv-connections') }}"
+__nfs_master_files_dest:                  "{{ __nfsMasterAddress }}:/{{ __persistentVolumePath }}"
+__nfs_master_files_mount:                 "/mnt/pv-connections"
diff --git a/roles/hcl/component-pack/tasks/enable_es_metrics.yml b/roles/hcl/component-pack/tasks/enable_es_metrics.yml
@@ -65,7 +65,7 @@
   become:                    false
 
 - name:                      Copy {{ __es_certs_dir_temp }}.zip to {{ dmgr_hostname }}
-  copy:
+  copy: 
     src:                     "{{ __es_certs_dir_temp }}.zip"
     dest:                    "{{ __es_certs_dir_temp }}.zip"
   delegate_to:               "{{ dmgr_hostname }}"
diff --git a/roles/hcl/component-pack/tasks/setup_community_ingress.yml b/roles/hcl/component-pack/tasks/setup_community_ingress.yml
@@ -105,63 +105,63 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Install ingress-nginx - if Vanilla Kubernetes if Prom-Operator already Deployed helm-2
-  shell:                     helm upgrade cnx-ingress -i {{ __helm2_ingress_chart }} --namespace {{ __default_namespace }} --set {{ __communityingress_env_vanilla }} -f cnx-ingress-values.yml
+  shell:                     helm upgrade cnx-ingress -i {{ __helm2_ingress_chart }} --namespace {{ __default_namespace }} --set {{ __communityingress_env_vanilla }} -f cnx-ingress-values.yml --wait
   when:
    - helm_version.stdout == "v2"
    - prom_operator_already_provisioned_helm2.rc == 0
    - ("eks.amazonaws.com" not in cluster_flavor_check.stdout) and  ("api." not in cluster_flavor_check.stdout)
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Install ingress-nginx - if Vanilla Kubernetes if Prom-Operator already Deployed helm-3
-  shell:                     helm upgrade cnx-ingress -i ingress-nginx/ingress-nginx --namespace {{ __default_namespace }} --set {{ __communityingress_env_vanilla }} -f cnx-ingress-values.yml
+  shell:                     helm upgrade cnx-ingress -i ingress-nginx/ingress-nginx --namespace {{ __default_namespace }} --set {{ __communityingress_env_vanilla }} -f cnx-ingress-values.yml --wait
   when:
    - helm_version.stdout != "v2"
    - prom_operator_already_provisioned_helm3.rc == 0
    - ("eks.amazonaws.com" not in cluster_flavor_check.stdout) and  ("api." not in cluster_flavor_check.stdout)
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Install ingress-nginx - if Vanilla Kubernetes if Prom-Operator Not already Deployed helm-2
-  shell:                     helm upgrade cnx-ingress -i {{ __helm2_ingress_chart }} --namespace {{ __default_namespace }} --set {{ __communitying_ind_env_vanilla }}
+  shell:                     helm upgrade cnx-ingress -i {{ __helm2_ingress_chart }} --namespace {{ __default_namespace }} --set {{ __communitying_ind_env_vanilla }} --wait
   when:
    - helm_version.stdout == "v2"
    - prom_operator_already_provisioned_helm2.rc != 0 
    - ("eks.amazonaws.com" not in cluster_flavor_check.stdout) and  ("api." not in cluster_flavor_check.stdout)
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Install ingress-nginx - if Vanilla Kubernetes if Prom-Operator Not already Deployed helm-3
-  shell:                     helm upgrade cnx-ingress -i ingress-nginx/ingress-nginx --namespace {{ __default_namespace }} --set {{ __communitying_ind_env_vanilla }}
+  shell:                     helm upgrade cnx-ingress -i ingress-nginx/ingress-nginx --namespace {{ __default_namespace }} --set {{ __communitying_ind_env_vanilla }} --wait
   when:
    - helm_version.stdout != "v2"
    - prom_operator_already_provisioned_helm3.rc != 0
    - ("eks.amazonaws.com" not in cluster_flavor_check.stdout) and  ("api." not in cluster_flavor_check.stdout)
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Install ingress-nginx - if EKS/OpenShift  if Prom-Operator already Deployed helm-2
-  shell:                     helm upgrade cnx-ingress -i {{ __helm2_ingress_chart }} --namespace {{ __default_namespace }} --set {{ __communityingress_env_eks_os }} -f cnx-ingress-values.yml
+  shell:                     helm upgrade cnx-ingress -i {{ __helm2_ingress_chart }} --namespace {{ __default_namespace }} --set {{ __communityingress_env_eks_os }} -f cnx-ingress-values.yml --wait
   when:
    - helm_version.stdout == "v2"
    - ("eks.amazonaws.com" in cluster_flavor_check.stdout) or  ("api." in cluster_flavor_check.stdout)
    - prom_operator_already_provisioned_helm2.rc == 0
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Install ingress-nginx - if EKS/OpenShift  if Prom-Operator already Deployed helm-3
-  shell:                     helm upgrade cnx-ingress -i ingress-nginx/ingress-nginx --namespace {{ __default_namespace }} --set {{ __communityingress_env_eks_os }} -f cnx-ingress-values.yml
+  shell:                     helm upgrade cnx-ingress -i ingress-nginx/ingress-nginx --namespace {{ __default_namespace }} --set {{ __communityingress_env_eks_os }} -f cnx-ingress-values.yml --wait
   when:
    - helm_version.stdout != "v2"
    - ("eks.amazonaws.com" in cluster_flavor_check.stdout) or  ("api." in cluster_flavor_check.stdout)
    - prom_operator_already_provisioned_helm3.rc == 0
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Install ingress-nginx - if EKS/OpenShift  if Prom-Operator Not already Deployed helm-2
-  shell:                     helm upgrade cnx-ingress -i {{ __helm2_ingress_chart }} --namespace {{ __default_namespace }} --set {{ __communitying_ind_env_eks_os }}
+  shell:                     helm upgrade cnx-ingress -i {{ __helm2_ingress_chart }} --namespace {{ __default_namespace }} --set {{ __communitying_ind_env_eks_os }} --wait
   when:
    - helm_version.stdout == "v2"
    - ("eks.amazonaws.com" in cluster_flavor_check.stdout) or  ("api." in cluster_flavor_check.stdout)
    - prom_operator_already_provisioned_helm2.rc != 0
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Install ingress-nginx - if EKS/OpenShift  if Prom-Operator Not already Deployed helm-3
-  shell:                     helm upgrade cnx-ingress -i ingress-nginx/ingress-nginx --namespace {{ __default_namespace }} --set {{ __communitying_ind_env_eks_os }}
+  shell:                     helm upgrade cnx-ingress -i ingress-nginx/ingress-nginx --namespace {{ __default_namespace }} --set {{ __communitying_ind_env_eks_os }} --wait
   when:
    - helm_version.stdout != "v2"
    - ("eks.amazonaws.com" in cluster_flavor_check.stdout) or  ("api." in cluster_flavor_check.stdout)
@@ -190,9 +190,5 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup cnx-ingress Ingress Rule Only
-  command:                   "helm upgrade cnx-ingress-rule {{ cnxingress_tgz.files[0].path }} -i -f {{ __cnxingressonly_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade cnx-ingress-rule {{ cnxingress_tgz.files[0].path }} -i -f {{ __cnxingressonly_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
-
-- name:                      Give it some space...
-  pause:
-    seconds:                 5
diff --git a/roles/hcl/component-pack/tasks/setup_customizer.yml b/roles/hcl/component-pack/tasks/setup_customizer.yml
@@ -68,7 +68,7 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup customizer
-  command:                   "helm upgrade mw-proxy {{ customizer_tgz.files[0].path }} -i -f {{ __customizer_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade mw-proxy {{ customizer_tgz.files[0].path }} -i -f {{ __customizer_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Wait for mw-proxy to come up
diff --git a/roles/hcl/component-pack/tasks/setup_elasticsearch.yml b/roles/hcl/component-pack/tasks/setup_elasticsearch.yml
@@ -16,13 +16,9 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup elasticsearch
-  command:                   "helm upgrade elasticsearch {{ elasticsearch_tgz.files[0].path }} -i -f {{ __elasticsearch_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade elasticsearch {{ elasticsearch_tgz.files[0].path }} -i -f {{ __elasticsearch_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
-- name:                      Give it some space...
-  pause:
-    seconds:                 300
-
 - name:                      Check if es-master is up and running
   shell:                     kubectl get pods -n {{ __default_namespace }} | grep -i es-master | grep -i Running
   when:                      not __skip_pod_checks
diff --git a/roles/hcl/component-pack/tasks/setup_elasticsearch7.yml b/roles/hcl/component-pack/tasks/setup_elasticsearch7.yml
@@ -16,7 +16,7 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup elasticsearch7
-  command:                   "helm upgrade elasticsearch7 {{ elasticsearch7_tgz.files[0].path }} -i -f {{ __elasticsearch_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade elasticsearch7 {{ elasticsearch7_tgz.files[0].path }} -i -f {{ __elasticsearch_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Wait for es-data-7-0 pod to become ready
diff --git a/roles/hcl/component-pack/tasks/setup_elasticstack.yml b/roles/hcl/component-pack/tasks/setup_elasticstack.yml
@@ -12,7 +12,7 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup elasticstack
-  command:                   "helm upgrade elasticstack {{ elasticstack_tgz.files[0].path }} -i -f {{ __elasticstack_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade elasticstack {{ elasticstack_tgz.files[0].path }} -i -f {{ __elasticstack_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Wait for Kibana, Filebeat and Logstash to come up
diff --git a/roles/hcl/component-pack/tasks/setup_elasticstack7.yml b/roles/hcl/component-pack/tasks/setup_elasticstack7.yml
@@ -12,7 +12,7 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup elasticstack7
-  command:                   "helm upgrade elasticstack-7 {{ elasticstack7_tgz.files[0].path }} -i -f {{ __elasticstack7_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade elasticstack-7 {{ elasticstack7_tgz.files[0].path }} -i -f {{ __elasticstack7_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Wait for Kibana, Filebeat and Logstash to come up
diff --git a/roles/hcl/component-pack/tasks/setup_infrastructure.yml b/roles/hcl/component-pack/tasks/setup_infrastructure.yml
@@ -16,7 +16,7 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup infrastructure
-  command:                   "helm upgrade infrastructure {{ infrastructure_tgz.files[0].path }} -i -f {{ __infrastructure_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade infrastructure {{ infrastructure_tgz.files[0].path }} -i -f {{ __infrastructure_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Wait for infrastructure to come up
diff --git a/roles/hcl/component-pack/tasks/setup_ingress.yml b/roles/hcl/component-pack/tasks/setup_ingress.yml
@@ -65,7 +65,7 @@
     msg:                     "{{ cnxingress_tgz.files[0].path }}"
 
 - name:                      Setup cnx-ingress
-  command:                   "helm upgrade cnx-ingress {{ cnxingress_tgz.files[0].path }} -i -f {{ __cnxingress_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade cnx-ingress {{ cnxingress_tgz.files[0].path }} -i -f {{ __cnxingress_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Give it some space...
diff --git a/roles/hcl/component-pack/tasks/setup_kudosboards.yml b/roles/hcl/component-pack/tasks/setup_kudosboards.yml
@@ -34,5 +34,5 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup kudosboards
-  command:                   "helm upgrade kudos-boards-cp {{ kudosboards_tgz.files[0].path }} -i -f {{ __kudos_boards_destination }} --namespace {{ __default_namespace }} --recreate-pods"
+  command:                   "helm upgrade kudos-boards-cp {{ kudosboards_tgz.files[0].path }} -i -f {{ __kudos_boards_destination }} --namespace {{ __default_namespace }}"
   become_user:               "{{ __sudo_user }}"
diff --git a/roles/hcl/component-pack/tasks/setup_orientme.yml b/roles/hcl/component-pack/tasks/setup_orientme.yml
@@ -16,7 +16,7 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup orientme
-  command:                   "helm upgrade orientme {{ orientme_tgz.files[0].path }} -i -f {{ __orientme_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade orientme {{ orientme_tgz.files[0].path }} -i -f {{ __orientme_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Wait for people-migrate pod to become ready
diff --git a/roles/hcl/component-pack/tasks/setup_outlook_addin.yml b/roles/hcl/component-pack/tasks/setup_outlook_addin.yml
@@ -34,5 +34,5 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup connections-outlook-desktop
-  command:                   "helm upgrade connections-outlook-desktop {{ outlook_tgz.files[0].path }} -i -f {{ __outlook_addin_destination }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade connections-outlook-desktop {{ outlook_tgz.files[0].path }} -i -f {{ __outlook_addin_destination }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
diff --git a/roles/hcl/component-pack/tasks/setup_psp.yml b/roles/hcl/component-pack/tasks/setup_psp.yml
@@ -12,7 +12,3 @@
 - name:                    Upgrade PSP
   command:                 "helm upgrade k8s-psp {{ psp_tgz.files[0].path }} -i --set namespace={{ __default_namespace }} --namespace {{ __default_namespace }}"
   become_user:             "{{ __sudo_user }}"
-
-- name:                    Give k8s-psp the couple of seconds
-  pause:
-    seconds:               10
diff --git a/roles/hcl/component-pack/tasks/setup_tailored_exp.yml b/roles/hcl/component-pack/tasks/setup_tailored_exp.yml
@@ -16,7 +16,7 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup tailored_exp
-  command:                   "helm upgrade tailored-exp {{ tailored_exp_tgz.files[0].path }} -i -f {{ __tailored_exp_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade tailored-exp {{ tailored_exp_tgz.files[0].path }} -i -f {{ __tailored_exp_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Wait for te-creation-wizard to come up
diff --git a/roles/hcl/component-pack/tasks/setup_teams.yml b/roles/hcl/component-pack/tasks/setup_teams.yml
@@ -16,7 +16,7 @@
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Setup teams
-  command:                   "helm upgrade teams {{ teams_tgz.files[0].path }} -i -f {{ __teams_env }} --namespace {{ __default_namespace }}"
+  command:                   "helm upgrade teams {{ teams_tgz.files[0].path }} -i -f {{ __teams_env }} --namespace {{ __default_namespace }} --wait"
   become_user:               "{{ __sudo_user }}"
 
 - name:                      Wait for teams to come up
diff --git a/roles/hcl/connections/mt/provision_users/tasks/main.yml b/roles/hcl/connections/mt/provision_users/tasks/main.yml
@@ -10,7 +10,7 @@
     __everyone:        "no"
     __allauth:         "no"
     __users:           "{{ __ic_admin_username }}"
-    __groups:          "{{ __ic_admin_password }}"
+    __groups:          ""
   with_items:
     - Communities
     - Profiles
diff --git a/roles/third_party/docker-install/tasks/install_docker.yml b/roles/third_party/docker-install/tasks/install_docker.yml
@@ -77,7 +77,7 @@
   vars:
     ansible_python_interpreter:     /usr/bin/python3
   pip:
-    name:                   ['docker', 'passlib']
+    name:                   ['docker', 'passlib', 'six']
   when:
     - ansible_os_family == "RedHat"
 
diff --git a/roles/third_party/docker-install/tasks/setup_docker_registry.yml b/roles/third_party/docker-install/tasks/setup_docker_registry.yml
@@ -93,10 +93,17 @@
   when:
    - inventory_hostname == groups['docker_registry'][0]
    - ansible_os_family == "RedHat"
+  register: docker_registry_status
 
-- name:                             Wait a bit, container is just starting
-  pause:
-    seconds:                        30
+- name:                             Save Docker Registry status
+  set_fact:
+    docker_registry_is_running:     "{{ docker_registry_status.ansible_facts.docker_container.State.Running }}"
+
+- name:                             Fail if Docker Registry is not running
+  fail:
+    msg: "Docker Registry could not be started"
+  when: 
+   - not docker_registry_is_running
 
 - name:                             Test Docker Registry Login on RHEL
   vars:
diff --git a/roles/third_party/ibm/wasnd/was-dmgr-config-sec-custom-prop/tasks/main.yml b/roles/third_party/ibm/wasnd/was-dmgr-config-sec-custom-prop/tasks/main.yml
diff --git a/roles/third_party/kubernetes/install-network-addons/tasks/install_addons.yml b/roles/third_party/kubernetes/install-network-addons/tasks/install_addons.yml
diff --git a/roles/third_party/kubernetes/setup-master-node/tasks/init_master.yml b/roles/third_party/kubernetes/setup-master-node/tasks/init_master.yml
