diff options
Diffstat (limited to 'deploy')
20 files changed, 164 insertions, 55 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/ext-network/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/ext-network/tasks/main.yml index 4d2afc24..b52b9178 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/ext-network/tasks/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/ext-network/tasks/main.yml @@ -17,6 +17,9 @@ - name: restart neutron server service: name=neutron-server state=restarted enabled=yes +- name: wait for neutron time + shell: "sleep 10" + - name: create external net neutron_network: login_username: ADMIN diff --git a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/check_network.py b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/check_network.py new file mode 100644 index 00000000..72a5db97 --- /dev/null +++ b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/check_network.py @@ -0,0 +1,56 @@ +import yaml +import sys +import subprocess + +import log as logging + +LOG = logging.getLogger("net-check") + +def is_ip_reachable(ip): + cmd = "ping -c 2 %s" % ip + process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=None, shell=True) + + output = process.communicate()[0] + if " 0% packet loss" in output: + LOG.info("%s is reachable", ip) + elif "100% packet loss" in output: + LOG.error("%s is unreachable" % (ip)) + return False + else: + LOG.warn("%r", output) + + return True + +def is_host_ips_reachable(settings): + external = settings["br-prv"]["ip"] + external_gw = settings["br-prv"]["gw"] + storage = settings["storage"]["ip"] + mgmt = settings["mgmt"]["ip"] + + return is_ip_reachable(external) \ + and is_ip_reachable(external_gw) \ + and is_ip_reachable(storage) \ + and is_ip_reachable(mgmt) + +def main(hostname, config): + LOG.info("host is %s", hostname) + + result = True + + for host, settings in config.iteritems(): + LOG.info("check %s network connectivity start", host) + result = result and is_host_ips_reachable(settings) + + if result: + LOG.info("All hosts ips are reachable") + else: + LOG.error("Some hosts ips are unreachable !!!") + sys.exit(-1) + +if __name__ == "__main__": + hostname = yaml.load(sys.argv[1]) + config = yaml.load(sys.argv[2]) + config.pop(hostname, None) + + main(hostname, config) + diff --git a/deploy/adapters/ansible/roles/setup-network/tasks/main.yml b/deploy/adapters/ansible/roles/setup-network/tasks/main.yml index 7873c073..e1fdf925 100644 --- a/deploy/adapters/ansible/roles/setup-network/tasks/main.yml +++ b/deploy/adapters/ansible/roles/setup-network/tasks/main.yml @@ -38,6 +38,9 @@ with_items: - setup_networks/log.py - setup_networks/setup_networks.py + - setup_networks/check_network.py + tags: + - network_check - name: copy boot scripts copy: src={{ item }} dest=/etc/init.d/ mode=0755 @@ -58,7 +61,18 @@ tags: - recovery +- name: check basic network connectivity + shell: > + python /opt/setup_networks/check_network.py \ + "{{ inventory_hostname }}" \ + "{{ ip_settings }}" + tags: + - network_check + retries: 3 + delay: 2 + - name: add to boot scripts service: name=net_init enabled=yes - meta: flush_handlers + diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml index b13b76f9..8d5794f7 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml @@ -31,9 +31,9 @@ hosts: - ceph-mon - name: host3 - mac: 'D8:49:0B:DA:67:1F' + mac: '78:D7:52:A0:B1:99' interfaces: - - eth1: 'D8:49:0B:DA:67:20' + - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 ipmiPass: Huawei@123 roles: diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml index 9eb4adae..bd10dc6d 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml @@ -31,9 +31,9 @@ hosts: - ceph-osd - name: host3 - mac: 'D8:49:0B:DA:67:1F' + mac: '78:D7:52:A0:B1:99' interfaces: - - eth1: 'D8:49:0B:DA:67:20' + - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 ipmiPass: Huawei@123 roles: diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml index 16739a8b..2286bc6a 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml @@ -35,9 +35,9 @@ hosts: - ceph-mon - name: host3 - mac: 'D8:49:0B:DA:67:1F' + mac: '78:D7:52:A0:B1:99' interfaces: - - eth1: 'D8:49:0B:DA:67:20' + - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 ipmiPass: Huawei@123 roles: diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml index 98b24a1e..241ea650 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml @@ -33,9 +33,9 @@ hosts: - ceph-mon - name: host3 - mac: 'D8:49:0B:DA:67:1F' + mac: '78:D7:52:A0:B1:99' interfaces: - - eth1: 'D8:49:0B:DA:67:20' + - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 ipmiPass: Huawei@123 roles: diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml index 2c578faa..f7d2b587 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml @@ -35,9 +35,9 @@ hosts: - ceph-mon - name: host3 - mac: 'D8:49:0B:DA:67:1F' + mac: '78:D7:52:A0:B1:99' interfaces: - - eth1: 'D8:49:0B:DA:67:20' + - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 ipmiPass: Huawei@123 roles: diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml index aec1ff09..09d59628 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml @@ -33,9 +33,9 @@ hosts: - ceph-mon - name: host3 - mac: 'D8:49:0B:DA:67:1F' + mac: '78:D7:52:A0:B1:99' interfaces: - - eth1: 'D8:49:0B:DA:67:20' + - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 ipmiPass: Huawei@123 roles: diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml index 98ae5eba..e7956d9b 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml @@ -35,9 +35,9 @@ hosts: - ceph-mon - name: host3 - mac: 'D8:49:0B:DA:67:1F' + mac: '78:D7:52:A0:B1:99' interfaces: - - eth1: 'D8:49:0B:DA:67:20' + - eth1: '78:D7:52:A0:B1:9A' ipmiIp: 172.16.130.29 ipmiPass: Huawei@123 roles: diff --git a/deploy/conf/hardware_environment/huawei-pod5/network.yml b/deploy/conf/hardware_environment/huawei-pod5/network.yml index dbaba01c..9d3eea1b 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/network.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/network.yml @@ -55,8 +55,8 @@ ip_settings: - name: external ip_ranges: - - - "10.145.140.100" - - "10.145.140.105" + - - "10.145.140.10" + - "10.145.140.50" cidr: "10.145.140.0/24" gw: "10.145.140.1" role: diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml index b15ce35a..8f603de5 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml @@ -55,8 +55,8 @@ ip_settings: - name: external ip_ranges: - - - "10.145.140.100" - - "10.145.140.105" + - - "10.145.140.10" + - "10.145.140.50" cidr: "10.145.140.0/24" gw: "10.145.140.1" role: diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml index 6c543b48..69880200 100644 --- a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml +++ b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml @@ -55,8 +55,8 @@ ip_settings: - name: external ip_ranges: - - - "10.145.140.100" - - "10.145.140.105" + - - "10.145.140.10" + - "10.145.140.50" cidr: "10.145.140.0/24" gw: "10.145.140.1" role: diff --git a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml index b885c22b..f026b4f7 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml @@ -13,46 +13,52 @@ hosts: interfaces: - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' - ipmiIp: 10.2.117.127 + ipmiIp: 10.2.117.134 roles: - controller - ha + - ceph-adm + - ceph-mon - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' - ipmiIp: 10.2.117.129 + ipmiIp: 10.2.117.136 roles: - controller - ha + - ceph-mon - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' - ipmiIp: 10.2.117.131 + ipmiIp: 10.2.117.138 roles: - controller - ha + - ceph-mon - name: host4 mac: '00:1E:67:D4:34:67' interfaces: - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' - ipmiIp: 10.2.117.133 + ipmiIp: 10.2.117.140 roles: - compute + - ceph-osd - name: host5 mac: '00:1E:67:D4:38:42' interfaces: - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' - ipmiIp: 10.2.117.135 + ipmiIp: 10.2.117.142 roles: - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml index 7892a0b5..b8d93d6b 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml @@ -13,45 +13,51 @@ hosts: interfaces: - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' - ipmiIp: 10.2.117.127 + ipmiIp: 10.2.117.134 roles: - controller - ha - opencontrail + - ceph-adm + - ceph-mon - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' - ipmiIp: 10.2.117.129 + ipmiIp: 10.2.117.136 roles: - compute + - ceph-osd - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' - ipmiIp: 10.2.117.131 + ipmiIp: 10.2.117.138 roles: - compute + - ceph-osd - name: host4 mac: '00:1E:67:D4:34:67' interfaces: - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' - ipmiIp: 10.2.117.133 + ipmiIp: 10.2.117.140 roles: - compute + - ceph-osd - name: host5 mac: '00:1E:67:D4:38:42' interfaces: - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' - ipmiIp: 10.2.117.135 + ipmiIp: 10.2.117.142 roles: - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml index 5d46b7ba..62075c05 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml @@ -15,7 +15,7 @@ hosts: interfaces: - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' - ipmiIp: 10.2.117.127 + ipmiIp: 10.2.117.134 roles: - controller - ha @@ -28,7 +28,7 @@ hosts: interfaces: - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' - ipmiIp: 10.2.117.129 + ipmiIp: 10.2.117.136 roles: - controller - ha @@ -40,7 +40,7 @@ hosts: interfaces: - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' - ipmiIp: 10.2.117.131 + ipmiIp: 10.2.117.138 roles: - controller - ha @@ -52,7 +52,7 @@ hosts: interfaces: - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' - ipmiIp: 10.2.117.133 + ipmiIp: 10.2.117.140 roles: - compute - ceph-osd @@ -62,7 +62,7 @@ hosts: interfaces: - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' - ipmiIp: 10.2.117.135 + ipmiIp: 10.2.117.142 roles: - compute - ceph-osd diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml index e70169d7..39f946b3 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml @@ -13,49 +13,55 @@ hosts: interfaces: - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' - ipmiIp: 10.2.117.127 + ipmiIp: 10.2.117.134 roles: - controller - ha - odl + - ceph-adm + - ceph-mon - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' - ipmiIp: 10.2.117.129 + ipmiIp: 10.2.117.136 roles: - controller - ha - odl + - ceph-mon - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' - ipmiIp: 10.2.117.131 + ipmiIp: 10.2.117.138 roles: - controller - ha - odl + - ceph-mon - name: host4 mac: '00:1E:67:D4:34:67' interfaces: - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' - ipmiIp: 10.2.117.133 + ipmiIp: 10.2.117.140 roles: - compute + - ceph-osd - name: host5 mac: '00:1E:67:D4:38:42' interfaces: - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' - ipmiIp: 10.2.117.135 + ipmiIp: 10.2.117.142 roles: - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml index b7914374..f4fadc94 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml @@ -15,49 +15,55 @@ hosts: interfaces: - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' - ipmiIp: 10.2.117.127 + ipmiIp: 10.2.117.134 roles: - controller - ha - odl + - ceph-adm + - ceph-mon - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' - ipmiIp: 10.2.117.129 + ipmiIp: 10.2.117.136 roles: - controller - ha - odl + - ceph-mon - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' - ipmiIp: 10.2.117.131 + ipmiIp: 10.2.117.138 roles: - controller - ha - odl + - ceph-mon - name: host4 mac: '00:1E:67:D4:34:67' interfaces: - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' - ipmiIp: 10.2.117.133 + ipmiIp: 10.2.117.140 roles: - compute + - ceph-osd - name: host5 mac: '00:1E:67:D4:38:42' interfaces: - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' - ipmiIp: 10.2.117.135 + ipmiIp: 10.2.117.142 roles: - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml index 5b1390d3..7606691e 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml @@ -13,49 +13,55 @@ hosts: interfaces: - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' - ipmiIp: 10.2.117.127 + ipmiIp: 10.2.117.134 roles: - controller - ha - onos + - ceph-adm + - ceph-mon - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' - ipmiIp: 10.2.117.129 + ipmiIp: 10.2.117.136 roles: - controller - ha - onos + - ceph-mon - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' - ipmiIp: 10.2.117.131 + ipmiIp: 10.2.117.138 roles: - controller - ha - onos + - ceph-mon - name: host4 mac: '00:1E:67:D4:34:67' interfaces: - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' - ipmiIp: 10.2.117.133 + ipmiIp: 10.2.117.140 roles: - compute + - ceph-osd - name: host5 mac: '00:1E:67:D4:38:42' interfaces: - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' - ipmiIp: 10.2.117.135 + ipmiIp: 10.2.117.142 roles: - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml index 0fab6b02..11bfd223 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml @@ -15,49 +15,55 @@ hosts: interfaces: - eth2: '00:1E:67:C5:5B:28' - eth3: '00:1E:67:C5:5B:29' - ipmiIp: 10.2.117.127 + ipmiIp: 10.2.117.134 roles: - controller - ha - onos + - ceph-adm + - ceph-mon - name: host2 mac: '00:1E:67:D4:39:B5' interfaces: - eth2: '00:1E:67:C5:52:24' - eth3: '00:1E:67:C5:52:25' - ipmiIp: 10.2.117.129 + ipmiIp: 10.2.117.136 roles: - controller - ha - onos + - ceph-mon - name: host3 mac: '00:1E:67:D4:31:B2' interfaces: - eth2: '00:1E:67:C1:FA:E0' - eth3: '00:1E:67:C1:FA:E1' - ipmiIp: 10.2.117.131 + ipmiIp: 10.2.117.138 roles: - controller - ha - onos + - ceph-mon - name: host4 mac: '00:1E:67:D4:34:67' interfaces: - eth2: '00:1E:67:E2:58:80' - eth3: '00:1E:67:E2:58:81' - ipmiIp: 10.2.117.133 + ipmiIp: 10.2.117.140 roles: - compute + - ceph-osd - name: host5 mac: '00:1E:67:D4:38:42' interfaces: - eth2: '00:1E:67:C1:F9:2C' - eth3: '00:1E:67:C1:F9:2D' - ipmiIp: 10.2.117.135 + ipmiIp: 10.2.117.142 roles: - compute + - ceph-osd |