From a9f6a2b1665a31bbdaf266c333410bde2418cf15 Mon Sep 17 00:00:00 2001
From: hu xinhui <xinhui_hu@foxmail.com>
Date: Tue, 14 Nov 2017 09:40:32 +0800
Subject: Support the scenario for installing kubernetes in ubuntu system

JIRA: -

Currently we only support the the scenario for installing kubernetes
in centos system. This patch is to install kubernetes in ubuntu system

Change-Id: Idc5eafea5d02c28c62a31e4c29451b8c5aaf1fd5
Signed-off-by: hu xinhui <xinhui_hu@foxmail.com>
---
 .../roles/setup-k8s-network/tasks/main.yml         | 62 ++--------------------
 1 file changed, 5 insertions(+), 57 deletions(-)

(limited to 'deploy/adapters/ansible/kubernetes/roles/setup-k8s-network/tasks/main.yml')

diff --git a/deploy/adapters/ansible/kubernetes/roles/setup-k8s-network/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/setup-k8s-network/tasks/main.yml
index c59fdfc5..674c80cc 100644
--- a/deploy/adapters/ansible/kubernetes/roles/setup-k8s-network/tasks/main.yml
+++ b/deploy/adapters/ansible/kubernetes/roles/setup-k8s-network/tasks/main.yml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -7,60 +7,8 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-- name: disable NetworkManager
-  service: name=NetworkManager state=stopped enabled=no
-  when: ansible_os_family == 'RedHat'
+- include: "{{ ansible_distribution }}.yml"
+  when: ansible_distribution == 'Ubuntu'
 
-- name: enable network service
-  service: name=network state=started enabled=yes
-  when: ansible_os_family == 'RedHat'
-
-- name: ensure script dir exist
-  shell: mkdir -p /opt/setup_networks
-
-- name: copy scripts
-  copy: src={{ item }} dest=/opt/setup_networks
-  with_items:
-    - setup_networks/log.py
-    - setup_networks/setup_networks.py
-    - setup_networks/check_network.py
-  tags:
-    - network_check
-
-
-- name: copy config files
-  template: src=network.cfg dest=/opt/setup_networks
-
-- name: config external nic
-  template:
-    src: ifcfg-eth.j2
-    dest: /etc/sysconfig/network-scripts/ifcfg-{{sys_intf_mappings["external"]["interface"]}}
-
-- name: remove defualt gw
-  lineinfile:
-    dest: /etc/sysconfig/network
-    regexp: "^GATEWAY=*"
-    state: absent
-
-- name: restart the network
-  shell: systemctl restart network
-
-- name: make sure python lib exist
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items:
-    - python-yaml
-    - python-netaddr
-
-- name: check basic network connectivity
-  shell: >
-    python /opt/setup_networks/check_network.py \
-           "{{ inventory_hostname }}" \
-           "{{ ip_settings | to_json }}"
-  register: result
-  until: result.stderr.find('unreachable')==-1
-  retries: 3
-  delay: 2
-  tags:
-    - network_check
-
-- meta: flush_handlers
+- include: "{{ ansible_os_family }}.yml"
+  when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7'
-- 
cgit 1.2.3-korg