network config persistence 27/1827/5
authorcarey.xu <carey.xuhan@huawei.com>
Sat, 19 Sep 2015 08:26:40 +0000 (16:26 +0800)
committercarey.xu <carey.xuhan@huawei.com>
Mon, 21 Sep 2015 16:13:23 +0000 (00:13 +0800)
JIRA: COMPASS-62

Change-Id: I0774ac3b77ecc7ebfe8b4cd2236c36c3a3099f1d
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
deploy/adapters/ansible/roles/setup-network/files/setup_networks/log.py [new file with mode: 0644]
deploy/adapters/ansible/roles/setup-network/files/setup_networks/net_init [new file with mode: 0755]
deploy/adapters/ansible/roles/setup-network/files/setup_networks/setup_networks.py [new file with mode: 0644]
deploy/adapters/ansible/roles/setup-network/tasks/main.yml
deploy/adapters/ansible/roles/setup-network/templates/network.cfg [new file with mode: 0644]

diff --git a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/log.py b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/log.py
new file mode 100644 (file)
index 0000000..fffeb58
--- /dev/null
@@ -0,0 +1,41 @@
+import logging
+import os
+loggers = {}
+log_dir="/var/log/setup_network"
+try:
+    os.makedirs(log_dir)
+except:
+    pass
+
+def getLogger(name):
+    if name in loggers:
+        return loggers[name]
+
+    logger = logging.getLogger(name)
+    logger.setLevel(logging.DEBUG)
+
+    # create file handler which logs even debug messages
+    log_file = "%s/%s.log" % (log_dir, name)
+    try:
+        os.remove(log_file)
+    except:
+        pass
+
+    fh = logging.FileHandler(log_file)
+    fh.setLevel(logging.DEBUG)
+
+    # create console handler with a higher log level
+    ch = logging.StreamHandler()
+    ch.setLevel(logging.ERROR)
+
+    # create formatter and add it to the handlers
+    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+    ch.setFormatter(formatter)
+    fh.setFormatter(formatter)
+
+    # add the handlers to logger
+    logger.addHandler(ch)
+    logger.addHandler(fh)
+
+    loggers[name] = logger
+    return logger
diff --git a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/net_init b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/net_init
new file mode 100755 (executable)
index 0000000..a74a006
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/bash
+## BEGIN INIT INFO
+# Provides: anamon.init
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 4 6
+# Required-Start: $network
+# Short-Description: Starts the cobbler anamon boot notification program
+# Description: anamon runs the first time a machine is booted after
+#              installation.
+## END INIT INFO
+
+#
+# anamon.init: Starts the cobbler post-install boot notification program
+#
+# chkconfig: 35 95 95
+#
+# description: anamon runs the first time a machine is booted after
+#              installation.
+#
+python /opt/setup_networks/setup_networks.py
diff --git a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/setup_networks.py b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/setup_networks.py
new file mode 100644 (file)
index 0000000..b46abce
--- /dev/null
@@ -0,0 +1,73 @@
+import yaml
+import netaddr
+import os
+import log as logging
+
+LOG = logging.getLogger("net-init")
+config_path = os.path.join(os.path.dirname(__file__), "network.cfg")
+#from socket import AF_INET
+#from pyroute2 import IPRoute
+#from pyroute2 import IPRouteRequest
+
+#ip = IPRoute()
+def setup_bondings(bond_mappings):
+    print bond_mappings
+
+def add_vlan_link(interface, ifname, vlan_id):
+    LOG.info("add_vlan_link enter")
+    #idx = ip.link_lookup(ifname=interface)[0]
+    #ip.link_create(ifname=ifname,
+    #               kind="vlan",
+    #               vlan_id=vlan_id,
+    #               link=idx)
+    cmd = "ip link add link %s name %s type vlan id %s; " % (ifname, interface, vlan_id)
+    cmd += "ip link set %s up; ip link set %s up" % (interface, ifname)
+    LOG.info("add_vlan_link: cmd=%s" % cmd)
+    os.system(cmd)
+
+def add_ovs_port(ovs_br, ifname, vlan_id=None):
+    LOG.info("add_ovs_port enter")
+    cmd = "ovs-vsctl --may-exist add-port %s %s" % (ovs_br, ifname)
+    if vlan_id:
+        cmd += " tag=%s" % vlan_id
+    cmd += " -- set Interface %s type=internal" % ifname
+    LOG.info("add_ovs_port: cmd=%s" % cmd)
+    os.system(cmd)
+
+def setup_intfs(sys_intf_mappings):
+    LOG.info("setup_intfs enter")
+    for intf_name, intf_info in sys_intf_mappings.items():
+        if intf_info["type"] == "vlan":
+            add_vlan_link(intf_name, intf_info["interface"], intf_info["vlan_tag"])
+        elif intf_info["type"] == "ovs":
+            add_ovs_port(intf_info["interface"], intf_name, vlan_id=intf_info.get("vlan_tag"))
+        else:
+            pass
+
+def setup_ips(ip_settings):
+    LOG.info("setup_ips enter")
+    for intf_info in ip_settings.values():
+        network = netaddr.IPNetwork(intf_info["cidr"])
+        intf_name = intf_info["alias"]
+        cmd = "ip addr add %s/%s brd %s dev %s;" \
+              % (intf_info["ip"], intf_info["netmask"], str(network.broadcast),intf_name)
+        if "gw" in intf_info:
+            cmd += "ip route add default via %s dev %s" % (intf_info["gw"], intf_name)
+        LOG.info("setup_ips: cmd=%s" % cmd)
+        os.system(cmd)
+        #idx = ip.link_lookup(ifname=intf_name)[0]
+        #ip.addr('add',
+        #        index=idx,
+        #        address=intf_info["ip"],
+        #        broadcast=str(network.broadcast),
+        #        prefixlen=intf_info["netmask"])
+
+def main(config):
+    setup_bondings(config["bond_mappings"])
+    setup_intfs(config["sys_intf_mappings"])
+    setup_ips(config["ip_settings"])
+
+if __name__ == "__main__":
+    os.system("service openvswitch-switch status|| service openvswitch-switch start")
+    config = yaml.load(open(config_path))
+    main(config)
index 8df1ac3..689e6e3 100644 (file)
   with_items: "{{ network_cfg['provider_net_mappings'] }}"
   when: 'item["type"] == "ovs"'
 
-- name: setup sys intf
-  shell: ip link del {{ item.key }}; \
-         ip link add link {{ item.value["interface"] }} name {{ item.key }} type vlan id {{ item.value["vlan_tag"] }}; \
-         ip link set {{ item.value["interface"] }} up
-  when: '"vlan_tag" in item.value and item.value["type"] == "vlan"'
-  with_dict: "{{ sys_intf_mappings }}"
-
-
-- name: set sys intf ip
-  shell: ip addr del {{ item.value["ip"] }}/{{ item.value["netmask"] }} dev {{ item.value["alias"] }}; \
-         ip addr add {{ item.value["ip"] }}/{{ item.value["netmask"] }} dev {{ item.value["alias"] }}; \
-         ip link set {{ item.value["alias"] }} up
-  with_dict: "{{ host_ip_settings }}"
-
-- name: set gateway
-  shell: ip route del default; \
-         ip route add default via {{ item.value["gw"] }} dev {{ item.key }}
-  when: '"gw" in item.value'
-  with_dict: "{{ host_ip_settings }}"
-
-- name: copy net config
-  template:  src=my_configs.debian dest=/etc/network/interfaces.d/my_configs.cfg
-  when: ansible_os_family == "Debian"
-
-- name: source net config
-  lineinfile: dest=/etc/network/interfaces line='source /etc/network/interfaces.d/my_configs.cfg'
+- 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
+
+- name: copy boot scripts
+  copy:  src={{ item }} dest=/etc/init.d mode=0755
+  with_items:
+    - setup_networks/net_init
+
+- name: copy config files
+  template: src=network.cfg dest=/opt/setup_networks
+
+- name: make sure python lib exist
+  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
+  with_items:
+    - python-yaml
+    - python-netaddr
+
+- name: run scripts
+  shell: python /opt/setup_networks/setup_networks.py
+
+- name: add to boot scripts
+  shell: update-rc.d net_init defaults 0 6
   when: ansible_os_family == "Debian"
diff --git a/deploy/adapters/ansible/roles/setup-network/templates/network.cfg b/deploy/adapters/ansible/roles/setup-network/templates/network.cfg
new file mode 100644 (file)
index 0000000..230d10a
--- /dev/null
@@ -0,0 +1,4 @@
+bond_mappings: {{ network_cfg["bond_mappings"] }}
+ip_settings: {{ ip_settings[inventory_hostname] }}
+sys_intf_mappings: {{ sys_intf_mappings }}
+