diff options
33 files changed, 468 insertions, 224 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 diff --git a/docs/FAQ/faq.rst b/docs/FAQ/faq.rst index 4697d537..feae4142 100644 --- a/docs/FAQ/faq.rst +++ b/docs/FAQ/faq.rst @@ -68,7 +68,7 @@ The public virtual IP is configured in "compass4nfv/deploy/conf/network_cfg.yaml How to access BM nodes after deployment ======================================= -1. First you should login Compass VM via ssh command on JumpHost by default user/pass root/root. +1. First you should login Compass VM via ssh command on Jumphost by default user/pass root/root. The default login IP of Compass VM is configured in "compass4nfv/deploy/conf/base.conf", defined as below: .. code-block:: bash @@ -99,7 +99,7 @@ which are configured in "compass4nfv/deploy/conf/base.conf", defined as below: +---+VM+--+ | +-------------+ +--------------------+ | | | | +-------------+ - | JumpHost | | | | + | Jumphost | | | | | | +----------+ host3 | +--------------------+ | | +-------------+ @@ -111,8 +111,8 @@ Where is OpenStack RC file It is located /opt/admin-openrc.sh in each BM node as default. Please source it first if you want to use OpenStack CLI. -How to recovery network connection after jumpserver reboot -========================================================== +How to recovery network connection after Jumphost reboot +======================================================== .. code-block:: bash diff --git a/docs/FAQ/how-to-deploy-while-jumphost-cannot-access-internet.rst b/docs/FAQ/how-to-deploy-while-jumphost-cannot-access-internet.rst index 37db1aed..f12d38d0 100644 --- a/docs/FAQ/how-to-deploy-while-jumphost-cannot-access-internet.rst +++ b/docs/FAQ/how-to-deploy-while-jumphost-cannot-access-internet.rst @@ -1,10 +1,10 @@ .. two dots create a comment. please leave this logo at the top of each of your rst files. -How to deploy while jumphost cannot access internet +How to deploy while Jumphost cannot access internet =================================================== -If your jumphost cannot access internet, don't worry, you can definitely deploy compass without internet access. +If your Jumphost cannot access internet, don't worry, you can definitely deploy compass without internet access. -You can download compass.iso first from OPNFV artifacts repository (http://artifacts.opnfv.org/, search compass4nfv and select an appropriate ISO file) via wget or curl. Then copy the compass.iso and the compass4nfv repository to your jumphost and editor the ISO_URL to your local path. +You can download compass.iso first from OPNFV artifacts repository (http://artifacts.opnfv.org/, search compass4nfv and select an appropriate ISO file) via wget or curl. Then copy the compass.iso and the compass4nfv repository to your Jumphost and editor the ISO_URL to your local path. After that you can deploy compass without internet access. diff --git a/docs/FAQ/index.rst b/docs/FAQ/index.rst index d152895a..7b349d0e 100644 --- a/docs/FAQ/index.rst +++ b/docs/FAQ/index.rst @@ -2,7 +2,7 @@ .. http://creativecommons.org/licenses/by/4.0 ========================================================= -OPNFV(Brahmaputra) Compass4nfv Frequently Asked Questions +OPNFV(Colorado) Compass4nfv Frequently Asked Questions ========================================================= Contents: diff --git a/docs/configguide/bmdeploy.rst b/docs/installationprocedure/bmdeploy.rst index d8430adc..6ec70fa4 100644 --- a/docs/configguide/bmdeploy.rst +++ b/docs/installationprocedure/bmdeploy.rst @@ -10,10 +10,12 @@ Nodes Configuration (Bare Metal Deployment) The below file is the inventory template of deployment nodes: -"compass4nfv/deploy/conf/hardware_environment/huawei-pod1/[dha].yml" +"compass4nfv/deploy/conf/hardware_environment/huawei-pod1/dha.yml" You can write your own IPMI IP/User/Password/Mac address/roles reference to it. + - name -- Host name for deployment node after installation. + - ipmiVer -- IPMI interface version for deployment node support. IPMI 1.0 or IPMI 2.0 is available. @@ -26,10 +28,26 @@ You can write your own IPMI IP/User/Password/Mac address/roles reference to it. - mac -- MAC Address of deployment node PXE NIC . - - name -- Host name for deployment node after installation. - - roles -- Components deployed. +**Set TYPE/FLAVOR and POWER TOOL** + +E.g. +.. code-block:: yaml + + TYPE: baremetal + FLAVOR: cluster + POWER_TOOL: ipmitool + +**Set ipmiUser/ipmiPass and ipmiVer** + +E.g. + +.. code-block:: yaml + + ipmiUser: USER + ipmiPass: PASSWORD + ipmiVer: '2.0' **Assignment of different roles to servers** @@ -39,11 +57,19 @@ E.g. Openstack only deployment roles setting hosts: - name: host1 + mac: 'F8:4A:BF:55:A2:8D' + interfaces: + - eth1: 'F8:4A:BF:55:A2:8E' + ipmiIp: 172.16.130.26 roles: - controller - ha - name: host2 + mac: 'D8:49:0B:DA:5A:B7' + interfaces: + - eth1: 'D8:49:0B:DA:5A:B8' + ipmiIp: 172.16.130.27 roles: - compute @@ -56,6 +82,10 @@ E.g. Openstack and ceph deployment roles setting hosts: - name: host1 + mac: 'F8:4A:BF:55:A2:8D' + interfaces: + - eth1: 'F8:4A:BF:55:A2:8E' + ipmiIp: 172.16.130.26 roles: - controller - ha @@ -63,6 +93,10 @@ E.g. Openstack and ceph deployment roles setting - ceph-mon - name: host2 + mac: 'D8:49:0B:DA:5A:B7' + interfaces: + - eth1: 'D8:49:0B:DA:5A:B8' + ipmiIp: 172.16.130.27 roles: - compute - ceph-osd @@ -73,12 +107,20 @@ E.g. Openstack and ODL deployment roles setting hosts: - name: host1 + mac: 'F8:4A:BF:55:A2:8D' + interfaces: + - eth1: 'F8:4A:BF:55:A2:8E' + ipmiIp: 172.16.130.26 roles: - controller - ha - odl - name: host2 + mac: 'D8:49:0B:DA:5A:B7' + interfaces: + - eth1: 'D8:49:0B:DA:5A:B8' + ipmiIp: 172.16.130.27 roles: - compute @@ -88,21 +130,29 @@ E.g. Openstack and ONOS deployment roles setting hosts: - name: host1 + mac: 'F8:4A:BF:55:A2:8D' + interfaces: + - eth1: 'F8:4A:BF:55:A2:8E' + ipmiIp: 172.16.130.26 roles: - controller - ha - onos - name: host2 + mac: 'D8:49:0B:DA:5A:B7' + interfaces: + - eth1: 'D8:49:0B:DA:5A:B8' + ipmiIp: 172.16.130.27 roles: - compute - Network Configuration (Bare Metal Deployment) --------------------------------------------- -Before deployment, there are some network configuration to be checked based on your network topology. -Compass4nfv network default configuration file is "compass4nfv/deploy/conf/network_cfg.yaml". +Before deployment, there are some network configuration to be checked based +on your network topology.Compass4nfv network default configuration file is +"compass4nfv/deploy/conf/hardware_environment/huawei-pod1/network.yml". You can write your own reference to it. **The following figure shows the default network configuration.** @@ -155,107 +205,124 @@ You can write your own reference to it. Start Deployment (Bare Metal Deployment) ---------------------------------------- -1. Set PXE/Installation NIC for Jumphost. (set eth1 E.g.) - -.. code-block:: bash - - export INSTALL_NIC=eth1 - - -2.Set OS version and OpenStack version for deployment nodes. +1. Edit run.sh +Set OS version and OpenStack version for deployment nodes. Compass4nfv Colorado supports three OS version based openstack mitaka. -Ubuntu 14.04 mitaka: +E.g. .. code-block:: bash + ########## Ubuntu14.04 Mitaka ########## export OS_VERSION=trusty export OPENSTACK_VERSION=mitaka -Ubuntu 16.04 mitaka: + ########## Ubuntu16.04 Mitaka ########## + # export OS_VERSION=xenial + # export OPENSTACK_VERSION=mitaka_xenial -.. code-block:: bash + ########## Centos7 Mitaka ########## + # export OS_VERSION=centos7 + # export OPENSTACK_VERSION=mitaka - export OS_VERSION=xenial - export OPENSTACK_VERSION=mitaka_xenial +Set ISO image that you want to deploy -Centos 7 mitaka: +E.g. .. code-block:: bash - export OS_VERSION=centos7 - export OPENSTACK_VERSION=mitaka + # ISO_URL is your iso's absolute path + export ISO_URL=file:///home/compass/compass4nfv.iso + # or + # export ISO_URL=http://artifacts.opnfv.org/compass4nfv/colorado/opnfv-colorado.1.0.iso -3. Set ISO image that you want to deploy +Set Jumphost PXE NIC. (set eth1 E.g.) + +E.g. .. code-block:: bash - export ISO_URL=file:///${YOUR_OWN}/compass.iso - or - export ISO_URL=http://artifacts.opnfv.org/compass4nfv/colorado/opnfv-colorado.1.0.iso + ########## Hardware Deploy Jumphost PXE NIC ########## + # you need comment out it when virtual deploy + export INSTALL_NIC=eth1 -4. Run ``deploy.sh`` with inventory and network configuration +Set scenario that you want to deploy + +E.g. + +nosdn-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh --dha ${YOUR_OWN}/dha.yml --network ${YOUR_OWN}/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml -E.g. + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml -1. nosdn-nofeature scenario deploy sample +ocl-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml \ - --network ./deploy/conf/hardware_environment/huawei-pod1/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml -2. ocl-nofeature scenario deploy sample +odl_l2-moon scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml \ - --network ./deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml -3. odl_l2-moon scenario deploy sample + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml + +odl_l2-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml \ - --network ./deploy/conf/hardware_environment/huawei-pod1/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml - 4. odl_l2-nofeature scenario deploy template +odl_l3-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml \ - --network ./deploy/conf/hardware_environment/huawei-pod1/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml -5. odl_l3-nofeature scenario deploy sample + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml + +onos-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml \ - --network ./deploy/conf/hardware_environment/huawei-pod1/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network_onos.yml -6. onos-nofeature scenario deploy sample +onos-sfc deploy scenario sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml \ - --network ./deploy/conf/hardware_environment/huawei-pod1/network_onos.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml -7. onos-sfc deploy scenario sample + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network_onos.yml -.. code-block:: bash +2. Run ``run.sh`` - ./deploy.sh \ - --dha ./deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml \ - --network ./deploy/conf/hardware_environment/huawei-pod1/network_onos.yml +.. code-block:: bash + ./run.sh diff --git a/docs/configguide/index.rst b/docs/installationprocedure/index.rst index fa212a03..6416e35d 100644 --- a/docs/configguide/index.rst +++ b/docs/installationprocedure/index.rst @@ -1,8 +1,8 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International Licence. +.. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 ******************************************************** -OPNFV(Colorado) Compass4nfv installation instructions +OPNFV(Colorado) Compass4nfv Installation Instructions ******************************************************** .. toctree:: @@ -10,7 +10,7 @@ OPNFV(Colorado) Compass4nfv installation instructions :maxdepth: 4 introduction.rst - installerconfig.rst + installation.instruction.rst bmdeploy.rst vmdeploy.rst references.rst diff --git a/docs/configguide/installerconfig.rst b/docs/installationprocedure/installation.instruction.rst index 21cd0825..87c8a55c 100644 --- a/docs/configguide/installerconfig.rst +++ b/docs/installationprocedure/installation.instruction.rst @@ -36,13 +36,12 @@ The stable release ISO can be retrieved via `OPNFV software download page <https The daily build ISO can be retrieved via OPNFV artifacts repository: -http://artifacts.opnfv.org/ +http://artifacts.opnfv.org/compass4nfv.html NOTE: Search the keyword "compass4nfv/Colorado" to locate the ISO image. E.g. -compass4nfv/colorado/opnfv-2016-01-16_15-03-18.iso -compass4nfv/colorado/opnfv-2016-01-16_15-03-18.properties +compass4nfv/colorado/opnfv-2016-09-18_08-15-13.iso The name of iso image includes the time of iso building, you can get the daily ISO according the building time. @@ -57,26 +56,12 @@ To retrieve the repository of Compass4nfv on Jumphost use the following command: - git clone https://gerrit.opnfv.org/gerrit/compass4nfv -NOTE: PLEASE DO NOT GIT CLONE COMPASS4NFV IN root DIRECTORY. +NOTE: PLEASE DO NOT GIT CLONE COMPASS4NFV IN ROOT DIRECTORY(INCLUDE SUBFOLDERS). To get stable /colorado release, you can use the following command: - git checkout colorado.1.0 -If you don't have a Linux foundation user id, get it first by the url: - -https://wiki.opnfv.org/developer/getting_started - -If you want to use a daily release ISO, please checkout the corresponding sha1 to -get the deployment scripts: - -E.g. -Git sha1 in file "opnfv-2016-01-16_15-03-18.properties" is -d5a13ce7cc2ce89946d34b0402ecf33c1d291851 - -- git checkout d5a13ce7cc2ce89946d34b0402ecf33c1d291851 - - Setup Requirements ------------------ @@ -167,4 +152,3 @@ In order to execute a deployment, one must gather the following information: 2. IPMI login information for the nodes (user/pass). 3. MAC address of Control Plane / Provisioning interfaces of the Bare Metal nodes. -.. diff --git a/docs/configguide/introduction.rst b/docs/installationprocedure/introduction.rst index 820cb29a..835a5788 100644 --- a/docs/configguide/introduction.rst +++ b/docs/installationprocedure/introduction.rst @@ -5,7 +5,7 @@ Abstract ======== -This document describes how to install the Brahmaputra release of OPNFV when +This document describes how to install the Colorado release of OPNFV when using Compass4nfv as a deployment tool covering it's limitations, dependencies and required system resources. @@ -16,6 +16,12 @@ Version history | **Date** | **Ver.** | **Author** | **Comment** | | | | | | +--------------------+--------------------+--------------------+---------------------------+ +| 2016-09-13 | 2.1.0 | Yuenan Li | Adjusted the docs | +| | | (HUAWEI) | structure | ++--------------------+--------------------+--------------------+---------------------------+ +| 2016-09-12 | 2.0.0 | Yuenan Li | Rewritten for | +| | | (HUAWEI) | Compass4nfv C release | ++--------------------+--------------------+--------------------+---------------------------+ | 2016-01-17 | 1.0.0 | Justin chi | Rewritten for | | | | (HUAWEI) | Compass4nfv B release | +--------------------+--------------------+--------------------+---------------------------+ diff --git a/docs/configguide/postinstall.rst b/docs/installationprocedure/postinstall.rst index f9b7aa92..f9b7aa92 100644 --- a/docs/configguide/postinstall.rst +++ b/docs/installationprocedure/postinstall.rst diff --git a/docs/configguide/references.rst b/docs/installationprocedure/references.rst index 467bf08d..c7ede9c8 100644 --- a/docs/configguide/references.rst +++ b/docs/installationprocedure/references.rst @@ -17,7 +17,7 @@ OPNFV OpenStack --------- -`OpenStack Liberty Release artifacts <http://www.openstack.org/software/liberty>`_ +`OpenStack Mitaka Release artifacts <http://www.openstack.org/software/mitaka>`_ `OpenStack documentation <http://docs.openstack.org>`_ diff --git a/docs/configguide/vmdeploy.rst b/docs/installationprocedure/vmdeploy.rst index 546936d7..cb5df6fb 100644 --- a/docs/configguide/vmdeploy.rst +++ b/docs/installationprocedure/vmdeploy.rst @@ -10,7 +10,7 @@ Nodes Configuration (Virtual Deployment) The below file is the inventory template of deployment nodes: -"compass4nfv/deploy/conf/vm_environment/huawei-virtual1/network.yml" +"./deploy/conf/vm_environment/huawei-virtual1/network.yml" You can write your own address/roles reference to it. @@ -18,6 +18,14 @@ You can write your own address/roles reference to it. - roles -- Components deployed. +**Set TYPE and FLAVOR** + +E.g. + +.. code-block:: yaml + + TYPE: virtual + FLAVOR: cluster **Assignment of different roles to servers** @@ -85,12 +93,12 @@ E.g. Openstack and ONOS deployment roles setting roles: - compute - Network Configuration (Virtual Deployment) ------------------------------------------ -Before deployment, there are some network configuration to be checked based on your network topology. -Compass4nfv network default configuration file is "compass4nfv/deploy/conf/network_cfg.yaml". +Before deployment, there are some network configuration to be checked based +on your network topology.Compass4nfv network default configuration file is +"compass4nfv/deploy/conf/vm_environment/huawei-virtual1/network.yml". You can write your own reference to it. **The following figure shows the default network configuration.** @@ -133,107 +141,120 @@ You can write your own reference to it. | External Network | | +---------------------------+ | +-----------------------+---+ - | PXE(Installation) Network | + | Installation Network | +---------------------------+ - Start Deployment (Virtual Deployment) ------------------------------------- -1. Set OS version and OpenStack version for deployment nodes. +1. Edit run.sh +Set OS version and OpenStack version for deployment nodes. Compass4nfv Colorado supports three OS version based openstack mitaka. -Ubuntu 14.04 mitaka: +E.g. .. code-block:: bash + ########## Ubuntu14.04 Mitaka ########## export OS_VERSION=trusty export OPENSTACK_VERSION=mitaka -Ubuntu 16.04 mitaka: + ########## Ubuntu16.04 Mitaka ########## + # export OS_VERSION=xenial + # export OPENSTACK_VERSION=mitaka_xenial -.. code-block:: bash + ########## Centos7 Mitaka ########## + # export OS_VERSION=centos7 + # export OPENSTACK_VERSION=mitaka - export OS_VERSION=xenial - export OPENSTACK_VERSION=mitaka_xenial +Set ISO image that you want to deploy -Centos 7 mitaka: +E.g. .. code-block:: bash - export OS_VERSION=centos7 - export OPENSTACK_VERSION=mitaka - -2. Set ISO image that you want to deploy + # ISO_URL is your iso's absolute path + # export ISO_URL=file:///home/compass/compass4nfv.iso + # or + # export ISO_URL=http://artifacts.opnfv.org/compass4nfv/colorado/opnfv-colorado.1.0.iso -.. code-block:: bash +Set scenario that you want to deploy - export ISO_URL=file:///${YOUR_OWN}/compass.iso - or - export ISO_URL=http://artifacts.opnfv.org/compass4nfv/colorado/opnfv-colorado.1.0.iso +E.g. -3. Run ``deploy.sh`` with inventory and network configuration +nosdn-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh --dha ${YOUR_OWN}/dha.yml --network ${YOUR_OWN}/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml -E.g. + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network.yml -1. nosdn-nofeature scenario deploy sample +ocl-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml \ - --network ./deploy/conf/vm_environment/huawei-virtual1/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/vm_environment/os-ocl-nofeature-ha.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml -2. ocl-nofeature scenario deploy sample +odl_l2-moon scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/vm_environment/os-ocl-nofeature-ha.yml \ - --network ./deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/vm_environment/os-odl_l2-moon-ha.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network.yml -3. odl_l2-moon scenario deploy sample +odl_l2-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/vm_environment/os-odl_l2-moon-ha.yml \ - --network ./deploy/conf/vm_environment/huawei-virtual1/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml -4. odl_l2-nofeature scenario deploy sample + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network.yml + +odl_l3-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml \ - --network ./deploy/conf/vm_environment/huawei-virtual1/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network.yml -5. odl_l3-nofeature scenario deploy sample +onos-nofeature scenario deploy sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml \ - --network ./deploy/conf/vm_environment/huawei-virtual1/network.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/vm_environment/os-onos-nofeature-ha.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network_onos.yml -6. onos-nofeature scenario deploy sample +onos-sfc deploy scenario sample .. code-block:: bash - ./deploy.sh \ - --dha ./deploy/conf/vm_environment/os-onos-nofeature-ha.yml \ - --network ./deploy/conf/vm_environment/huawei-virtual1/network_onos.yml + # DHA is your dha.yml's path + export DHA=./deploy/conf/vm_environment/os-onos-sfc-ha.yml -7. onos-sfc deploy scenario sample + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network_onos.yml -.. code-block:: bash +2. Run ``run.sh`` - ./deploy.sh \ - --dha ./deploy/conf/vm_environment/os-onos-sfc-ha.yml \ - --network ./deploy/conf/vm_environment/huawei-virtual1/network_onos.yml +.. code-block:: bash + ./run.sh diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst index 763280a5..c6050e91 100644 --- a/docs/release-notes/index.rst +++ b/docs/release-notes/index.rst @@ -5,11 +5,9 @@ OPNFV((Colorado) Compass4nfv Release Notes ============================================ -Contents: - .. toctree:: :numbered: - :maxdepth: 4 + :maxdepth: 3 release-notes.rst diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst index fa8b5f0c..ff8ec500 100644 --- a/docs/release-notes/release-notes.rst +++ b/docs/release-notes/release-notes.rst @@ -2,10 +2,7 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) Weidong Shao (HUAWEI) and Justin Chi (HUAWEI) -============================================================================================= -Release Note for the Brahmaputra release of OPNFV when using Compass4nfv as a deployment tool -============================================================================================= - +Release Note for the Colorado release of OPNFV when using Compass4nfv as a deployment tool. Abstract ======== @@ -34,7 +31,7 @@ Release Data | **Release designation** | Colorado.1.0 | | | | +--------------------------------------+--------------------------------------+ -| **Release date** | 2016.2.25 | +| **Release date** | September 22 2016 | | | | +--------------------------------------+--------------------------------------+ | **Purpose of the delivery** | OPNFV Colorado release | @@ -65,21 +62,21 @@ Version change Module version change ~~~~~~~~~~~~~~~~~~~~~ -This is the first release of compass4nfv as a deployment toolchain in OPNFV, the following +This is the Colorado release of compass4nfv as a deployment toolchain in OPNFV, the following upstream components supported with this release. - Ubuntu 14.04.3 - - Openstack (Liberty release) + - Openstack (Mitaka release) - - Opendaylight (Beryllium rc1 release) + - Opendaylight (Beryllium SR2 release) - - ONOS (Emu release) + - ONOS (Goldeneye release) Document version change ~~~~~~~~~~~~~~~~~~~~~~~ -None due to first release, and you can see document :ref:`document-label`. +Adjusted the document structure, and you can see document at `OPNFV(Colorado) Compass4nfv installation instructions <http://artifacts.opnfv.org/compass4nfv/docs/configguide/index.html>`_. Reason for new version ---------------------- @@ -91,13 +88,13 @@ Feature additions | **JIRA REFERENCE** | **SLOGAN** | | | | +--------------------------------------+-----------------------------------------+ -| JIRA: COMPASS-34 | Support OpenStack Liberty deployment | +| JIRA: COMPASS-438 | Add A Task Of ONOS-SFC | | | | +--------------------------------------+-----------------------------------------+ -| JIRA: COMPASS-307 | Integration OpenDaylight Beryllium | +| JIRA: COMPASS-443 | Add MOON in Compass | | | | +--------------------------------------+-----------------------------------------+ -| | | +| JIRA: COMPASS-444 | Add Xenial-mitaka ODL Support | | | | +--------------------------------------+-----------------------------------------+ @@ -111,7 +108,7 @@ Bug corrections | **JIRA REFERENCE** | **SLOGAN** | | | | +--------------------------------------+--------------------------------------+ -| JIRA: | | +| JIRA: COMPASS-459 | PXE boot may have NO SIGNAL | | | | +--------------------------------------+--------------------------------------+ @@ -122,9 +119,27 @@ Known Limitations, Issues and Workarounds System Limitations ------------------ +**Max number of blades:** 1 Jumphost, 3 Controllers, 20 Compute blades + +**Min number of blades:** 1 Jumphost, 1 Controller, 1 Compute blade + +**Storage:** Ceph is the only supported storage configuration + +**Min Jumphost requirements:** At least 16GB of RAM, 16 core CPU + Known issues ------------ ++---------------+----------------------------------------------+ +| **Scenario** | **Issue** | ++---------------+----------------------------------------------+ +| MOON | First ODL test FAILS because ODL/Openstack | +| | federation done in moon is partial. Only | +| | MD-SAL is federated (not AD-SAL) | ++---------------+----------------------------------------------+ +| | | ++---------------+----------------------------------------------+ + **JIRA TICKETS:** +--------------------------------------+--------------------------------------+ @@ -138,17 +153,12 @@ Known issues Workarounds ----------- -See JIRA: <link> +`See JIRA <https://jira.opnfv.org/issues/?jql=project%20%3D%20COMPASS%20AND%20labels%20%3D%20C-1.0-Workaround>`_ Test Result =========== -The Brahmaputra release with the Compass4nfv deployment toolchain has undergone QA test +The Colorado release with the Compass4nfv deployment toolchain has undergone QA test runs with the following results: - - `Functest test result <http://artifacts.opnfv.org/functest/docs/results/overview.html>`_ - - `Yardstick test result <http://testresults.opnfv.org/grafana/>`_ - -References -========== -For more information on the OPNFV Brahmaputra release, please visit -http://www.opnfv.org/brahmaputra + - `Functest test result <http://testresults.opnfv.org/reporting/functest/release/colorado/index-status-compass.html>`_ + - `Yardstick test result <http://testresults.opnfv.org/reporting/yardstick/release/colorado/index-status-compass.html>`_ @@ -0,0 +1,49 @@ +#!/bin/bash +############################################################################## +# Copyright (c) 2016 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 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# ISO_URL is your iso's absolute path +# export ISO_URL=file:///home/compass/compass4nfv.iso +# or +# export ISO_URL=http://artifacts.opnfv.org/compass4nfv/colorado/opnfv-colorado.1.0.iso +export ISO_URL= + +# DHA is your dha.yml's path +# export DHA=/home/compass4nfv/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml +export DHA= + +# NETWORK is your network.yml's path +# export NETWORK=/home/compass4nfv/deploy/conf/vm_environment/huawei-virtual1/network.yml +export NETWORK= + +# node number when you virtual deploy +# export VIRT_NUMBER=5 + +########## Ubuntu14.04 Mitaka ########## +export OS_VERSION=trusty +export OPENSTACK_VERSION=mitaka + +########## Ubuntu16.04 Mitaka ########## +# export OS_VERSION=xenial +# export OPENSTACK_VERSION=mitaka_xenial + +########## Centos7 Mitaka ########## +# export OS_VERSION=centos7 +# export OPENSTACK_VERSION=mitaka + +########## Hardware Deploy Jumpserver PXE NIC ########## +# you need comment out it when virtual deploy +# export INSTALL_NIC=eth1 + +########## Deploy or Redeploy ########## +# export DEPLOY_HOST="true" +# export DEPLOY_FIRST_TIME="false" + +./deploy.sh + |