diff options
32 files changed, 742 insertions, 460 deletions
@@ -0,0 +1,53 @@ +#!/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 + +##########Deploy or Expansion########## +export EXPANSION="true" +export MANAGEMENT_IP_START="10.1.0.55" +export VIRT_NUMBER=1 + +########## 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 diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml index f49896bf..fe544630 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/tasks/main.yml @@ -31,7 +31,7 @@ when: ansible_os_family == "Debian" - name: update nova-compute conf - template: src=templates/{{ item }} dest=/etc/nova/{{ item }} + template: src={{ item }} dest=/etc/nova/{{ item }} with_items: - nova.conf notify: diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/templates/nova.conf b/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/templates/nova.conf new file mode 100644 index 00000000..73b49a5a --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/roles/nova-compute/templates/nova.conf @@ -0,0 +1,89 @@ +[DEFAULT] +block_device_allocate_retries=5 +block_device_allocate_retries_interval=300 +dhcpbridge_flagfile=/etc/nova/nova.conf +dhcpbridge=/usr/bin/nova-dhcpbridge +logdir=/var/log/nova +state_path=/var/lib/nova +lock_path=/var/lib/nova/tmp +force_dhcp_release=True +iscsi_helper=tgtadm +libvirt_use_virtio_for_bridges=True +connection_type=libvirt +root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf +verbose={{ VERBOSE}} +debug={{ DEBUG }} +ec2_private_dns_show_ip=True +api_paste_config=/etc/nova/api-paste.ini +volumes_path=/var/lib/nova/volumes +enabled_apis=osapi_compute,metadata + +default_floating_pool={{ public_net_info.network }} +auth_strategy = keystone + +rpc_backend = rabbit +rabbit_host = {{ rabbit_host }} +rabbit_userid = {{ RABBIT_USER }} +rabbit_password = {{ RABBIT_PASS }} + +osapi_compute_listen={{ internal_ip }} +metadata_listen={{ internal_ip }} + +my_ip = {{ internal_ip }} +vnc_enabled = True +vncserver_listen = {{ internal_ip }} +vncserver_proxyclient_address = {{ internal_ip }} +novncproxy_base_url = http://{{ public_vip.ip }}:6080/vnc_auto.html + +novncproxy_host = {{ internal_ip }} +novncproxy_port = 6080 + +network_api_class = nova.network.neutronv2.api.API +linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver +firewall_driver = nova.virt.firewall.NoopFirewallDriver +security_group_api = neutron + +instance_usage_audit = True +instance_usage_audit_period = hour +notify_on_state_change = vm_and_task_state +notification_driver = nova.openstack.common.notifier.rpc_notifier +notification_driver = ceilometer.compute.nova_notifier + +[database] +# The SQLAlchemy connection string used to connect to the database +connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova +idle_timeout = 30 +use_db_reconnect = True +pool_timeout = 10 + +[api_database] +connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova_api +idle_timeout = 30 +use_db_reconnect = True +pool_timeout = 10 + +[keystone_authtoken] +auth_uri = http://{{ internal_vip.ip }}:5000/2.0 +identity_uri = http://{{ internal_vip.ip }}:35357 +admin_tenant_name = service +admin_user = nova +admin_password = {{ NOVA_PASS }} + +[glance] +host = {{ internal_vip.ip }} + +[neutron] +url = http://{{ internal_vip.ip }}:9696 +auth_strategy = keystone +admin_tenant_name = service +admin_username = neutron +admin_password = {{ NEUTRON_PASS }} +admin_auth_url = http://{{ internal_vip.ip }}:35357/v2.0 +service_metadata_proxy = True +metadata_proxy_shared_secret = {{ METADATA_SECRET }} +auth_type = password +auth_url = http://{{ internal_vip.ip }}:35357 +password = {{ NEUTRON_PASS }} +username = neutron +project_domain_name = default +user_domain_name = default diff --git a/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml b/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml index 7ee60baa..5b80f400 100644 --- a/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml +++ b/deploy/adapters/ansible/roles/nova-compute/tasks/main.yml @@ -27,7 +27,7 @@ when: ansible_os_family == "Debian" - name: update nova-compute conf - template: src=templates/{{ item }} dest=/etc/nova/{{ item }} + template: src={{ item }} dest=/etc/nova/{{ item }} with_items: - nova.conf notify: diff --git a/deploy/adapters/ansible/roles/nova-compute/templates/nova.conf b/deploy/adapters/ansible/roles/nova-compute/templates/nova.conf new file mode 100644 index 00000000..e1e915c8 --- /dev/null +++ b/deploy/adapters/ansible/roles/nova-compute/templates/nova.conf @@ -0,0 +1,77 @@ +[DEFAULT] +block_device_allocate_retries=5 +block_device_allocate_retries_interval=300 +dhcpbridge_flagfile=/etc/nova/nova.conf +dhcpbridge=/usr/bin/nova-dhcpbridge +logdir=/var/log/nova +state_path=/var/lib/nova +lock_path=/var/lib/nova/tmp +force_dhcp_release=True +iscsi_helper=tgtadm +libvirt_use_virtio_for_bridges=True +connection_type=libvirt +root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf +verbose={{ VERBOSE}} +debug={{ DEBUG }} +ec2_private_dns_show_ip=True +api_paste_config=/etc/nova/api-paste.ini +volumes_path=/var/lib/nova/volumes +enabled_apis=osapi_compute,metadata + +default_floating_pool={{ public_net_info.network }} +auth_strategy = keystone + +rpc_backend = rabbit +rabbit_host = {{ rabbit_host }} +rabbit_userid = {{ RABBIT_USER }} +rabbit_password = {{ RABBIT_PASS }} + +osapi_compute_listen={{ internal_ip }} +metadata_listen={{ internal_ip }} + +my_ip = {{ internal_ip }} +vnc_enabled = True +vncserver_listen = {{ internal_ip }} +vncserver_proxyclient_address = {{ internal_ip }} +novncproxy_base_url = http://{{ public_vip.ip }}:6080/vnc_auto.html + +novncproxy_host = {{ internal_ip }} +novncproxy_port = 6080 + +network_api_class = nova.network.neutronv2.api.API +linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver +firewall_driver = nova.virt.firewall.NoopFirewallDriver +security_group_api = neutron + +instance_usage_audit = True +instance_usage_audit_period = hour +notify_on_state_change = vm_and_task_state +notification_driver = nova.openstack.common.notifier.rpc_notifier +notification_driver = ceilometer.compute.nova_notifier + +[database] +# The SQLAlchemy connection string used to connect to the database +connection = mysql://nova:{{ NOVA_DBPASS }}@{{ db_host }}/nova +idle_timeout = 30 +use_db_reconnect = True +pool_timeout = 10 + +[keystone_authtoken] +auth_uri = http://{{ internal_vip.ip }}:5000/2.0 +identity_uri = http://{{ internal_vip.ip }}:35357 +admin_tenant_name = service +admin_user = nova +admin_password = {{ NOVA_PASS }} + +[glance] +host = {{ internal_vip.ip }} + +[neutron] +url = http://{{ internal_vip.ip }}:9696 +auth_strategy = keystone +admin_tenant_name = service +admin_username = neutron +admin_password = {{ NEUTRON_PASS }} +admin_auth_url = http://{{ internal_vip.ip }}:35357/v2.0 +service_metadata_proxy = True +metadata_proxy_shared_secret = {{ METADATA_SECRET }} diff --git a/deploy/adapters/ansible/roles/open-contrail/files/provision/cacert.pem b/deploy/adapters/ansible/roles/open-contrail/files/provision/cacert.pem deleted file mode 100755 index 66f82c5d..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/provision/cacert.pem +++ /dev/null @@ -1,70 +0,0 @@ -Certificate: - Data: - Version: 1 (0x0) - Serial Number: 1 (0x1) - Signature Algorithm: md5WithRSAEncryption - Issuer: C=US, ST=CA, O=Open vSwitch, OU=switchca, CN=OVS switchca CA Certificate (2015 Sep 15 13:35:47) - Validity - Not Before: Sep 15 04:35:47 2015 GMT - Not After : Sep 12 04:35:47 2025 GMT - Subject: C=US, ST=CA, O=Open vSwitch, OU=switchca, CN=OVS switchca CA Certificate (2015 Sep 15 13:35:47) - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:98:04:9b:9f:2e:e2:0b:4a:59:9d:00:74:dc:b4: - cb:fc:8d:c4:7d:32:35:e5:1c:ee:94:f0:13:e6:54: - 1c:2e:47:47:f0:bd:f2:7f:ae:cb:6a:2f:ec:74:5c: - 14:39:80:bf:7b:d1:83:90:ec:7a:7d:02:8c:fc:67: - de:99:53:69:1f:5c:61:d5:0a:7f:93:df:02:d4:16: - d3:55:b8:28:5c:fd:32:5b:6c:af:03:c1:23:92:00: - 0e:2b:eb:32:07:00:99:64:14:32:e4:f8:76:b3:06: - e1:d0:54:5a:fc:92:cd:5e:e5:b7:85:43:9e:b8:79: - e4:23:a6:3c:0c:42:78:f4:d3:7e:33:1c:f2:5a:24: - ac:24:61:2f:72:b3:b1:e7:99:4e:ef:2d:85:26:de: - b6:59:16:25:1a:65:ce:95:9c:fd:c7:3c:30:44:1d: - 4c:3b:34:dd:8d:ad:1f:ee:06:8e:b1:2d:b1:bb:a6: - 68:62:52:98:c2:2d:a3:14:75:a7:5f:24:10:4f:74: - 4f:94:0b:61:bd:c5:f1:6b:78:fa:48:89:27:3b:04: - 4d:25:50:d1:4f:63:3d:4b:3c:cc:fa:df:20:f1:0c: - 3f:1d:44:9d:c2:3e:d4:12:07:72:a4:6a:11:03:2f: - 1d:71:d5:b2:de:b4:a6:d8:ad:7a:ac:c9:c7:8e:12: - 4d:47 - Exponent: 65537 (0x10001) - Signature Algorithm: md5WithRSAEncryption - 28:3f:32:46:dd:a9:c0:30:46:9a:29:ec:90:36:14:aa:a7:0c: - dc:67:a0:ec:81:dc:f9:34:35:c5:e4:9b:48:dd:c6:5a:ed:30: - 78:99:6c:32:8c:60:59:ab:dc:7a:86:bb:94:8b:98:db:62:33: - bd:4f:16:40:50:12:db:e9:b6:0c:f2:0b:0d:90:9d:b7:7a:ae: - b4:36:46:33:c5:ea:6a:37:ec:fe:6e:12:f1:98:10:89:48:fe: - 8a:68:11:1c:96:37:92:d9:cc:8a:ef:93:c3:53:6c:61:f7:f0: - 0b:2c:78:49:8e:e3:19:46:2b:1d:1c:65:c5:d9:6d:5d:04:54: - e7:e0:c7:aa:49:78:7d:2d:35:11:7e:05:b1:47:e4:96:39:97: - b5:5b:2b:6e:06:51:86:32:85:6a:7b:5f:63:08:85:31:6e:c3: - 12:0e:a0:ad:3a:d0:3f:db:e2:1b:6d:24:3a:bb:e7:61:5b:ba: - 1f:34:eb:34:07:e5:09:fe:0b:ba:76:48:49:6e:57:d4:14:76: - 11:af:52:39:9e:73:a7:e3:2a:5a:5c:fa:79:d7:7f:81:fd:80: - a7:d4:92:07:ef:a6:05:60:f9:b4:81:cb:8e:cb:b5:9e:2c:5d: - 40:fb:dc:c1:63:95:82:0b:2f:aa:8c:38:1d:96:63:ed:c9:1b: - ce:d2:d2:e7 ------BEGIN CERTIFICATE----- -MIIDeDCCAmACAQEwDQYJKoZIhvcNAQEEBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD -VQQIEwJDQTEVMBMGA1UEChMMT3BlbiB2U3dpdGNoMREwDwYDVQQLEwhzd2l0Y2hj -YTE7MDkGA1UEAxMyT1ZTIHN3aXRjaGNhIENBIENlcnRpZmljYXRlICgyMDE1IFNl -cCAxNSAxMzozNTo0NykwHhcNMTUwOTE1MDQzNTQ3WhcNMjUwOTEyMDQzNTQ3WjCB -gTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRUwEwYDVQQKEwxPcGVuIHZTd2l0 -Y2gxETAPBgNVBAsTCHN3aXRjaGNhMTswOQYDVQQDEzJPVlMgc3dpdGNoY2EgQ0Eg -Q2VydGlmaWNhdGUgKDIwMTUgU2VwIDE1IDEzOjM1OjQ3KTCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAJgEm58u4gtKWZ0AdNy0y/yNxH0yNeUc7pTwE+ZU -HC5HR/C98n+uy2ov7HRcFDmAv3vRg5Dsen0CjPxn3plTaR9cYdUKf5PfAtQW01W4 -KFz9MltsrwPBI5IADivrMgcAmWQUMuT4drMG4dBUWvySzV7lt4VDnrh55COmPAxC -ePTTfjMc8lokrCRhL3KzseeZTu8thSbetlkWJRplzpWc/cc8MEQdTDs03Y2tH+4G -jrEtsbumaGJSmMItoxR1p18kEE90T5QLYb3F8Wt4+kiJJzsETSVQ0U9jPUs8zPrf -IPEMPx1EncI+1BIHcqRqEQMvHXHVst60ptiteqzJx44STUcCAwEAATANBgkqhkiG -9w0BAQQFAAOCAQEAKD8yRt2pwDBGminskDYUqqcM3Geg7IHc+TQ1xeSbSN3GWu0w -eJlsMoxgWavceoa7lIuY22IzvU8WQFAS2+m2DPILDZCdt3qutDZGM8Xqajfs/m4S -8ZgQiUj+imgRHJY3ktnMiu+Tw1NsYffwCyx4SY7jGUYrHRxlxdltXQRU5+DHqkl4 -fS01EX4FsUfkljmXtVsrbgZRhjKFantfYwiFMW7DEg6grTrQP9viG20kOrvnYVu6 -HzTrNAflCf4LunZISW5X1BR2Ea9SOZ5zp+MqWlz6edd/gf2Ap9SSB++mBWD5tIHL -jsu1nixdQPvcwWOVggsvqow4HZZj7ckbztLS5w== ------END CERTIFICATE----- diff --git a/deploy/adapters/ansible/roles/open-contrail/files/provision/compute.filters.patch b/deploy/adapters/ansible/roles/open-contrail/files/provision/compute.filters.patch deleted file mode 100755 index 04bf42f3..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/provision/compute.filters.patch +++ /dev/null @@ -1,14 +0,0 @@ -*** a/compute.filters Mon Sep 28 15:13:48 2015 ---- b/compute.filters Mon Sep 28 15:16:06 2015 -*************** -*** 83,88 **** ---- 83,91 ---- - # nova/network/linux_net.py: 'ovs-vsctl', .... - ovs-vsctl: CommandFilter, ovs-vsctl, root - -+ # nova/virt/libvirt/vif.py: 'vrouter-port-control', ... -+ vrouter-port-control: CommandFilter, vrouter-port-control, root -+ - # nova/network/linux_net.py: 'ovs-ofctl', .... - ovs-ofctl: CommandFilter, ovs-ofctl, root - diff --git a/deploy/adapters/ansible/roles/open-contrail/files/provision/model.py.patch b/deploy/adapters/ansible/roles/open-contrail/files/provision/model.py.patch deleted file mode 100755 index 7f7f7c6f..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/provision/model.py.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** a/model.py Mon Sep 28 15:05:29 2015 ---- b/model.py Mon Sep 28 15:17:32 2015 -*************** -*** 39,44 **** ---- 39,45 ---- - VIF_TYPE_HW_VEB = 'hw_veb' - VIF_TYPE_MLNX_DIRECT = 'mlnx_direct' - VIF_TYPE_MIDONET = 'midonet' -+ VIF_TYPE_VROUTER = 'vrouter' - VIF_TYPE_OTHER = 'other' - - # Constants for dictionary keys in the 'vif_details' field in the VIF diff --git a/deploy/adapters/ansible/roles/open-contrail/files/provision/test_vif.py.patch b/deploy/adapters/ansible/roles/open-contrail/files/provision/test_vif.py.patch deleted file mode 100755 index 3e12c72a..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/provision/test_vif.py.patch +++ /dev/null @@ -1,70 +0,0 @@ -*** a/test_vif.py Mon Sep 28 15:12:56 2015 ---- b/test_vif.py Mon Sep 28 15:19:20 2015 -*************** -*** 235,240 **** ---- 235,253 ---- - subnets=[subnet_bridge_4], - interface='eth0') - -+ network_vrouter = network_model.Network(id='network-id-xxx-yyy-zzz', -+ label=None, -+ bridge=None, -+ subnets=[subnet_bridge_4, -+ subnet_bridge_6], -+ interface='eth0') -+ -+ vif_vrouter = network_model.VIF(id='vif-xxx-yyy-zzz', -+ address='ca:fe:de:ad:be:ef', -+ network=network_vrouter, -+ type=network_model.VIF_TYPE_VROUTER, -+ devname='tap-xxx-yyy-zzz') -+ - vif_mlnx = network_model.VIF(id='vif-xxx-yyy-zzz', - address='ca:fe:de:ad:be:ef', - network=network_mlnx, -*************** -*** 796,801 **** ---- 809,851 ---- - self.vif_mlnx) - self.assertEqual(0, execute.call_count) - -+ def test_unplug_vrouter_with_details(self): -+ d = vif.LibvirtGenericVIFDriver() -+ with mock.patch.object(utils, 'execute') as execute: -+ d.unplug_vrouter(None, self.vif_vrouter) -+ execute.assert_called_once_with( -+ 'vrouter-port-control', -+ '--oper=delete --uuid=vif-xxx-yyy-zzz', -+ run_as_root=True) -+ -+ def test_plug_vrouter_with_details(self): -+ d = vif.LibvirtGenericVIFDriver() -+ instance = mock.Mock() -+ instance.name = 'instance-name' -+ instance.uuid = '46a4308b-e75a-4f90-a34a-650c86ca18b2' -+ instance.project_id = 'b168ea26fa0c49c1a84e1566d9565fa5' -+ instance.display_name = 'instance1' -+ with mock.patch.object(utils, 'execute') as execute: -+ d.plug_vrouter(instance, self.vif_vrouter) -+ execute.assert_has_calls([ -+ mock.call('ip', 'tuntap', 'add', 'tap-xxx-yyy-zzz', 'mode', -+ 'tap', run_as_root=True, check_exit_code=[0, 2, 254]), -+ mock.call('ip', 'link', 'set', 'tap-xxx-yyy-zzz', 'up', -+ run_as_root=True, check_exit_code=[0, 2, 254]), -+ mock.call('vrouter-port-control', -+ '--oper=add --uuid=vif-xxx-yyy-zzz ' -+ '--instance_uuid=46a4308b-e75a-4f90-a34a-650c86ca18b2 ' -+ '--vn_uuid=network-id-xxx-yyy-zzz ' -+ '--vm_project_uuid=b168ea26fa0c49c1a84e1566d9565fa5 ' -+ '--ip_address=0.0.0.0 ' -+ '--ipv6_address=None ' -+ '--vm_name=instance1 ' -+ '--mac=ca:fe:de:ad:be:ef ' -+ '--tap_name=tap-xxx-yyy-zzz ' -+ '--port_type=NovaVMPort ' -+ '--tx_vlan_id=-1 ' -+ '--rx_vlan_id=-1', run_as_root=True)]) -+ - def test_ivs_ethernet_driver(self): - d = vif.LibvirtGenericVIFDriver(self._get_conn(ver=9010)) - self._check_ivs_ethernet_driver(d, diff --git a/deploy/adapters/ansible/roles/open-contrail/files/provision/vif.py.patch b/deploy/adapters/ansible/roles/open-contrail/files/provision/vif.py.patch deleted file mode 100755 index 103f084a..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/provision/vif.py.patch +++ /dev/null @@ -1,91 +0,0 @@ -*** a/vif.py Mon Sep 28 15:13:30 2015 ---- b/vif.py Mon Sep 28 15:21:30 2015 -*************** -*** 332,337 **** ---- 332,347 ---- - - return conf - -+ def get_config_vrouter(self, instance, vif, image_meta, -+ inst_type, virt_type): -+ conf = self.get_base_config(instance, vif, image_meta, -+ inst_type, virt_type) -+ dev = self.get_vif_devname(vif) -+ designer.set_vif_host_backend_ethernet_config(conf, dev) -+ -+ designer.set_vif_bandwidth_config(conf, inst_type) -+ return conf -+ - def get_config(self, instance, vif, image_meta, - inst_type, virt_type): - vif_type = vif['type'] -*************** -*** 526,531 **** ---- 536,580 ---- - except processutils.ProcessExecutionError: - LOG.exception(_LE("Failed while plugging vif"), instance=instance) - -+ def plug_vrouter(self, instance, vif): -+ """Plug into Contrail's network port -+ Bind the vif to a Contrail virtual port. -+ """ -+ dev = self.get_vif_devname(vif) -+ ip_addr = '0.0.0.0' -+ ip6_addr = None -+ subnets = vif['network']['subnets'] -+ for subnet in subnets: -+ if not subnet['ips']: -+ continue -+ ips = subnet['ips'][0] -+ if not ips['address']: -+ continue -+ if (ips['version'] == 4): -+ if ips['address'] is not None: -+ ip_addr = ips['address'] -+ if (ips['version'] == 6): -+ if ips['address'] is not None: -+ ip6_addr = ips['address'] -+ -+ ptype = 'NovaVMPort' -+ if (cfg.CONF.libvirt.virt_type == 'lxc'): -+ ptype = 'NameSpacePort' -+ -+ cmd_args = ("--oper=add --uuid=%s --instance_uuid=%s --vn_uuid=%s " -+ "--vm_project_uuid=%s --ip_address=%s --ipv6_address=%s" -+ " --vm_name=%s --mac=%s --tap_name=%s --port_type=%s " -+ "--tx_vlan_id=%d --rx_vlan_id=%d" % (vif['id'], -+ instance.uuid, vif['network']['id'], -+ instance.project_id, ip_addr, ip6_addr, -+ instance.display_name, vif['address'], -+ vif['devname'], ptype, -1, -1)) -+ try: -+ linux_net.create_tap_dev(dev) -+ utils.execute('vrouter-port-control', cmd_args, run_as_root=True) -+ except processutils.ProcessExecutionError: -+ LOG.exception(_LE("Failed while plugging vif"), instance=instance) -+ - def plug(self, instance, vif): - vif_type = vif['type'] - -*************** -*** 679,684 **** ---- 728,746 ---- - LOG.exception(_LE("Failed while unplugging vif"), - instance=instance) - -+ def unplug_vrouter(self, instance, vif): -+ """Unplug Contrail's network port -+ Unbind the vif from a Contrail virtual port. -+ """ -+ dev = self.get_vif_devname(vif) -+ cmd_args = ("--oper=delete --uuid=%s" % (vif['id'])) -+ try: -+ utils.execute('vrouter-port-control', cmd_args, run_as_root=True) -+ linux_net.delete_net_dev(dev) -+ except processutils.ProcessExecutionError: -+ LOG.exception( -+ _LE("Failed while unplugging vif"), instance=instance) -+ - def unplug(self, instance, vif): - vif_type = vif['type'] - diff --git a/deploy/adapters/ansible/roles/open-contrail/files/provision/vtep-cert.pem b/deploy/adapters/ansible/roles/open-contrail/files/provision/vtep-cert.pem deleted file mode 100755 index dc354d33..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/provision/vtep-cert.pem +++ /dev/null @@ -1,70 +0,0 @@ -Certificate: - Data: - Version: 1 (0x0) - Serial Number: 2 (0x2) - Signature Algorithm: md5WithRSAEncryption - Issuer: C=US, ST=CA, O=Open vSwitch, OU=switchca, CN=OVS switchca CA Certificate (2015 Sep 15 13:35:47) - Validity - Not Before: Sep 15 04:36:00 2015 GMT - Not After : Sep 12 04:36:00 2025 GMT - Subject: C=US, ST=CA, O=Open vSwitch, OU=Open vSwitch certifier, CN=vtep id:b55b8c06-9593-4406-8a85-f7edd09a1ea9 - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:ca:57:ec:4d:a3:79:6c:a4:cd:21:c7:52:a8:9f: - 61:85:ee:a5:91:79:4a:f3:80:ac:1b:ac:1a:6d:0b: - 96:b9:cf:1f:a6:23:1f:45:ff:62:de:35:8f:e8:8d: - 4a:63:23:70:d5:1e:78:72:86:04:08:e2:fd:66:04: - e0:1e:ce:57:03:98:f7:a5:92:5a:f1:cc:3c:24:37: - 22:4e:97:0d:65:4b:98:08:5b:cd:1c:eb:67:f5:9c: - c0:ba:86:94:2a:15:dc:5d:47:6e:45:49:03:62:a3: - 37:5f:54:58:42:49:6d:a3:4c:c6:21:f6:08:36:8c: - 69:20:6a:f8:7c:5d:82:30:14:1a:15:ad:b9:42:ba: - 5d:13:99:e2:6f:aa:10:e4:e1:25:58:90:66:a7:e7: - bc:c7:e4:5c:79:2a:1b:b2:b3:d1:7b:4d:78:a6:28: - 66:bc:ee:97:6b:b4:3d:a0:65:16:10:04:fb:e9:4e: - 82:ac:88:c2:6a:a4:0e:d6:e5:ad:ee:bc:50:a7:73: - 97:6d:12:96:46:cb:ee:4d:15:ad:d4:a3:b5:95:82: - 2e:e7:1b:69:70:1d:b5:c9:06:47:44:2b:55:84:23: - 5b:75:56:86:c4:a7:b9:1d:46:9e:fa:8a:a5:dc:f9: - 70:16:6a:87:ee:20:1b:02:d1:2d:83:65:e0:7c:24: - 99:e9 - Exponent: 65537 (0x10001) - Signature Algorithm: md5WithRSAEncryption - 50:bf:af:aa:b5:a7:3c:67:2e:34:92:8a:b8:cc:b9:96:a8:b8: - 16:cd:d5:5d:d3:b6:1c:44:b4:08:c5:89:ea:17:97:88:a4:e4: - 89:b9:69:2b:71:36:77:05:dc:0a:50:fe:2d:8f:8c:72:a5:b9: - b1:45:23:0d:d3:7a:80:c8:9e:66:74:e2:42:ee:96:19:e5:88: - 3d:e3:ea:3c:d4:51:1e:e0:34:1f:0c:d3:9a:f7:99:9b:af:0b: - 23:57:87:f0:dc:8c:32:1c:e9:63:65:f3:cd:e5:22:ed:ea:fe: - 4f:be:0e:23:0d:8e:3e:09:aa:5e:20:2b:1a:4f:70:92:4a:a9: - 24:6e:a0:c6:86:b5:14:7d:52:71:cf:b8:5c:75:d4:6a:92:06: - 30:cf:71:72:ff:44:63:22:10:79:38:53:ec:6f:19:3d:63:92: - 69:3f:f2:f4:28:d4:ef:dd:af:32:84:c5:a0:c0:c9:5f:1f:02: - 47:76:bd:85:85:4e:7c:58:61:1a:ce:4c:03:45:d7:5c:dd:59: - 6c:22:e0:cb:2c:2d:b1:44:4c:03:dd:21:ff:58:6e:f7:09:4f: - 34:e0:24:3a:67:b1:33:ae:4a:bc:85:db:4b:12:ef:21:66:6a: - f0:b9:ea:90:72:b1:0b:34:9a:8d:be:f3:d1:02:56:0f:d7:bb: - 0a:eb:c2:f1 ------BEGIN CERTIFICATE----- -MIIDgDCCAmgCAQIwDQYJKoZIhvcNAQEEBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD -VQQIEwJDQTEVMBMGA1UEChMMT3BlbiB2U3dpdGNoMREwDwYDVQQLEwhzd2l0Y2hj -YTE7MDkGA1UEAxMyT1ZTIHN3aXRjaGNhIENBIENlcnRpZmljYXRlICgyMDE1IFNl -cCAxNSAxMzozNTo0NykwHhcNMTUwOTE1MDQzNjAwWhcNMjUwOTEyMDQzNjAwWjCB -iTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRUwEwYDVQQKEwxPcGVuIHZTd2l0 -Y2gxHzAdBgNVBAsTFk9wZW4gdlN3aXRjaCBjZXJ0aWZpZXIxNTAzBgNVBAMTLHZ0 -ZXAgaWQ6YjU1YjhjMDYtOTU5My00NDA2LThhODUtZjdlZGQwOWExZWE5MIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylfsTaN5bKTNIcdSqJ9hhe6lkXlK -84CsG6wabQuWuc8fpiMfRf9i3jWP6I1KYyNw1R54coYECOL9ZgTgHs5XA5j3pZJa -8cw8JDciTpcNZUuYCFvNHOtn9ZzAuoaUKhXcXUduRUkDYqM3X1RYQklto0zGIfYI -NoxpIGr4fF2CMBQaFa25QrpdE5nib6oQ5OElWJBmp+e8x+RceSobsrPRe014pihm -vO6Xa7Q9oGUWEAT76U6CrIjCaqQO1uWt7rxQp3OXbRKWRsvuTRWt1KO1lYIu5xtp -cB21yQZHRCtVhCNbdVaGxKe5HUae+oql3PlwFmqH7iAbAtEtg2XgfCSZ6QIDAQAB -MA0GCSqGSIb3DQEBBAUAA4IBAQBQv6+qtac8Zy40koq4zLmWqLgWzdVd07YcRLQI -xYnqF5eIpOSJuWkrcTZ3BdwKUP4tj4xypbmxRSMN03qAyJ5mdOJC7pYZ5Yg94+o8 -1FEe4DQfDNOa95mbrwsjV4fw3IwyHOljZfPN5SLt6v5Pvg4jDY4+CapeICsaT3CS -SqkkbqDGhrUUfVJxz7hcddRqkgYwz3Fy/0RjIhB5OFPsbxk9Y5JpP/L0KNTv3a8y -hMWgwMlfHwJHdr2FhU58WGEazkwDRddc3VlsIuDLLC2xREwD3SH/WG73CU804CQ6 -Z7Ezrkq8hdtLEu8hZmrwueqQcrELNJqNvvPRAlYP17sK68Lx ------END CERTIFICATE----- diff --git a/deploy/adapters/ansible/roles/open-contrail/files/provision/vtep-privkey.pem b/deploy/adapters/ansible/roles/open-contrail/files/provision/vtep-privkey.pem deleted file mode 100755 index 673f4242..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/provision/vtep-privkey.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAylfsTaN5bKTNIcdSqJ9hhe6lkXlK84CsG6wabQuWuc8fpiMf -Rf9i3jWP6I1KYyNw1R54coYECOL9ZgTgHs5XA5j3pZJa8cw8JDciTpcNZUuYCFvN -HOtn9ZzAuoaUKhXcXUduRUkDYqM3X1RYQklto0zGIfYINoxpIGr4fF2CMBQaFa25 -QrpdE5nib6oQ5OElWJBmp+e8x+RceSobsrPRe014pihmvO6Xa7Q9oGUWEAT76U6C -rIjCaqQO1uWt7rxQp3OXbRKWRsvuTRWt1KO1lYIu5xtpcB21yQZHRCtVhCNbdVaG -xKe5HUae+oql3PlwFmqH7iAbAtEtg2XgfCSZ6QIDAQABAoIBAQCKDMya98J7PkD6 -H8ykYQEfaH+rrc5WLd6+joAFD9gI82hLaEEI98HTi0Wgyu0KkH6F2OEieY69JWjv -NrpWKj8xpCap3x2PROFvb/JHHkW0a4vRgBiD95QY/ZZ8bB8gS4PqXDa+rJ7TqDm6 -H4iLyR81P8caGorl9Iww4uqfpwiQlZ7A/dMexufQgMQXKqDXSKk+TJ36CBRJyLlk -U6GrHIF9obHZyGelNhkkMu/czT54U/gKiufL5tYpOVyjCr8H2a713ovEfYzEFxJq -Z8C0ySIskXsyhZ/pC0+pviMB2R20Nh8kRXiKCvNNbFShEMujB5gUVo7rqUZKFKMz -FCfbcXrRAoGBAPeRwU5zU5nbiSQlB7YQibtFC/sMDzbbOjulN46UeDvkcVh80j4r -FIPYLAPvA/e9OtRV89B6Tc7rZSWYZotszvJVlObs0/ll+L1pUX7PAEligoZCXufR -GUyT0gZunGO8+FEgYIu89S1xN77WIbqopjjEyGQJeN2UX9bPo9AGTU0VAoGBANE7 -5nwtdsR1hjgxBqzgAFEFqCggHR+D050OtQgkLjHkXRT1uHeJZZu4D0x6vEnJknYi -/OCujz196KLDGEQbREIdARtgemy07GoJuBXTwPuvbkw9vjoqDrIKVtMeTf4HSyzO -2ej2pm280A/VI6GyahDIFSUZmFBqMeTUzB5UXNaFAoGAe61RCMQMa7yE0o29QHMa -m3du+MeZgioa+VkcXBpHxoPlK/OPhIc5BHSl6IErVkQuc41M9EVlQY3PRezQra55 -5A5lCMgfTWRn0xgeIl9/ISoZUsEtcFnBbcQbFCOF9T2eP8kQ8j4/raf11VxcFUfT -YmDMS02AGBHbnxC0IWREkdECgYBDaXQyEAfS9jZ/RjRrYGRZtmPeQbKAY927HXDw -JZAInRXsWdrMEKV/DUdIkca2U05v54fn7/XQjw9z2T2pO8u7LVMc+fGXspb09xqr -VaU4seXshHwUi1ZewHwG2x2vubPbxO1qZIVsl8fFQhuPzkbkD0LYyC1Nw1k9692z -6+RZbQKBgH/6OqqsHLnpzQD0drcOjbXws53g3/eECPXCMNzzw0AiSkyrGWzSonMD -+uSMrG0f7DwvHxZ09bn4qqFqCE7yhoCWWUYSBZKEDYzpxTq9krahPmaJznaBXyFi -K2rfym1sYEZvDT9nS5TROtiIW0uANHOjI9yw+a8TQEyQu8CH2/C0 ------END RSA PRIVATE KEY----- diff --git a/deploy/client.py b/deploy/client.py index 51919838..f6a07a77 100644 --- a/deploy/client.py +++ b/deploy/client.py @@ -49,6 +49,9 @@ def byteify(input): return input opts = [ + cfg.StrOpt('expansion', + help='is this an expansion?', + default='false'), cfg.StrOpt('compass_server', help='compass server url', default='http://127.0.0.1/api'), @@ -365,19 +368,24 @@ class CompassClient(object): assert(subnets) subnet_mapping = {} + _, subnets_in_db = self.client.list_subnets() for subnet in subnets: try: netaddr.IPNetwork(subnet) except: raise RuntimeError('subnet %s format is invalid' % subnet) - status, resp = self.client.add_subnet(subnet) - LOG.info('add subnet %s status %s response %s', - subnet, status, resp) - if not self.is_ok(status): - raise RuntimeError('failed to add subnet %s' % subnet) - - subnet_mapping[resp['subnet']] = resp['id'] + if CONF.expansion == "false": + status, resp = self.client.add_subnet(subnet) + LOG.info('add subnet %s status %s response %s', + subnet, status, resp) + if not self.is_ok(status): + raise RuntimeError('failed to add subnet %s' % subnet) + subnet_mapping[resp['subnet']] = resp['id'] + else: + for subnet_in_db in subnets_in_db: + if subnet == subnet_in_db['subnet']: + subnet_mapping[subnet] = subnet_in_db['id'] self.subnet_mapping = subnet_mapping @@ -418,6 +426,7 @@ class CompassClient(object): if hostname ] + machines = machines[-len(hostnames):] assert(len(machines) == len(hostnames)) machines_dict = [] @@ -439,9 +448,11 @@ class CompassClient(object): raise RuntimeError("add host to cluster failed") for host in resp['hosts']: - self.host_mapping[host['hostname']] = host['id'] + if host['hostname'] in hostnames: + self.host_mapping[host['hostname']] = host['id'] - assert(len(self.host_mapping) == len(machines)) + if CONF.expansion == "false": + assert(len(self.host_mapping) == len(machines)) def set_cluster_os_config(self, cluster_id): """set cluster os config.""" @@ -620,7 +631,7 @@ class CompassClient(object): ]) LOG.info( - 'add host %s interface %s ip %s network proprties %s', + 'add host %s interface %s ip %s network properties %s', hostname, interface, ip_str, properties) status, response = self.client.add_host_network( @@ -888,6 +899,10 @@ class CompassClient(object): if current_time() >= deployment_timeout: LOG.info("current_time=%s, deployment_timeout=%s" \ % (current_time(), deployment_timeout)) + LOG.info("cobbler status:") + os.system("ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ + -i %s root@192.168.200.2 \ + 'cobbler status'" % (CONF.rsa_file)) raise RuntimeError("installation timeout") try: @@ -928,29 +943,56 @@ def kill_print_proc(): os.system("ps aux|grep -v grep|grep -E 'ssh.+root@192.168.200.2'|awk '{print $2}'|xargs kill -9") def deploy(): - client = CompassClient() - machines = client.get_machines() + if CONF.expansion == "false": + client = CompassClient() + machines = client.get_machines() - LOG.info('machines are %s', machines) + LOG.info('machines are %s', machines) - client.add_subnets() - adapter_id, os_id, flavor_id = client.get_adapter() - cluster_id = client.add_cluster(adapter_id, os_id, flavor_id) + client.add_subnets() + adapter_id, os_id, flavor_id = client.get_adapter() + cluster_id = client.add_cluster(adapter_id, os_id, flavor_id) - client.add_cluster_hosts(cluster_id, machines) - client.set_host_networking() - client.set_cluster_os_config(cluster_id) + client.add_cluster_hosts(cluster_id, machines) + client.set_host_networking() + client.set_cluster_os_config(cluster_id) + + if flavor_id: + client.set_cluster_package_config(cluster_id) + + client.set_all_hosts_roles(cluster_id) + client.deploy_clusters(cluster_id) + + LOG.info("compass OS installtion is begin") + threading.Thread(target=print_ansible_log).start() + client.get_installing_progress(cluster_id) + client.check_dashboard_links(cluster_id) + + else: + client = CompassClient() + machines = client.get_machines() + + LOG.info('machines are %s', machines) + + client.add_subnets() + + status, response = client.client.list_clusters() + cluster_id = 1 + for cluster in response: + if cluster['name'] == CONF.cluster_name: + cluster_id = cluster['id'] + + client.add_cluster_hosts(cluster_id, machines) + client.set_host_networking() + client.set_cluster_os_config(cluster_id) - if flavor_id: client.set_cluster_package_config(cluster_id) - client.set_all_hosts_roles(cluster_id) - client.deploy_clusters(cluster_id) + client.set_all_hosts_roles(cluster_id) + client.deploy_clusters(cluster_id) - LOG.info("compass OS installtion is begin") - threading.Thread(target=print_ansible_log).start() - client.get_installing_progress(cluster_id) - client.check_dashboard_links(cluster_id) + threading.Thread(target=print_ansible_log).start() + client.get_installing_progress(cluster_id) def redeploy(): client = CompassClient() diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf index 24eb703d..d60e68b1 100644 --- a/deploy/conf/base.conf +++ b/deploy/conf/base.conf @@ -25,6 +25,8 @@ export ENABLE_SECGROUP=${ENABLE_SECGROUP:-"true"} export ENABLE_VPNAAS="false" export ENABLE_FWAAS="false" +export EXPANSION=${EXPANSION:-"false"} + function next_ip { ip_addr=$1 ip_base="$(echo $ip_addr | cut -d. -f'1 2 3')" diff --git a/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml b/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml new file mode 100644 index 00000000..b160b32a --- /dev/null +++ b/deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml @@ -0,0 +1,15 @@ +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiPass: Huawei@123 + +hosts: + - name: host6 + mac: 'E8:4D:D0:BA:60:45' + interfaces: + - eth1: '08:4D:D0:BA:60:44' + ipmiIp: 172.16.131.23 + roles: + - compute diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf index 0475ee9b..7f4fcf02 100644 --- a/deploy/conf/virtual.conf +++ b/deploy/conf/virtual.conf @@ -1,7 +1,7 @@ -export VIRT_NUMBER=5 -export VIRT_CPUS=4 -export VIRT_MEM=16384 -export VIRT_DISK=200G +export VIRT_NUMBER=${VIRT_NUMBER:-5} +export VIRT_CPUS=${VIRT_CPU:-4} +export VIRT_MEM=${VIRT_MEM:-16384} +export VIRT_DISK=${VIRT_DISK:-200G} export SWITCH_IPS="1.1.1.1" export SWITCH_CREDENTIAL="version=2c,community=public" diff --git a/deploy/conf/vm_environment/virtual_cluster_expansion.yml b/deploy/conf/vm_environment/virtual_cluster_expansion.yml new file mode 100644 index 00000000..3d3298d3 --- /dev/null +++ b/deploy/conf/vm_environment/virtual_cluster_expansion.yml @@ -0,0 +1,7 @@ +TYPE: virtual +FLAVOR: cluster + +hosts: + - name: host6 + roles: + - compute diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh index b38f4209..031b56a2 100755 --- a/deploy/deploy_host.sh +++ b/deploy/deploy_host.sh @@ -44,7 +44,7 @@ function deploy_host(){ --machines=${machines//\'} --switch_credential="${SWITCH_CREDENTIAL}" --deploy_type="${TYPE}" \ --deployment_timeout="${DEPLOYMENT_TIMEOUT}" --${POLL_SWITCHES_FLAG} --dashboard_url="${DASHBOARD_URL}" \ --cluster_vip="${VIP}" --network_cfg="$NETWORK" --neutron_cfg="$NEUTRON" \ - --enable_secgroup="${ENABLE_SECGROUP}" --enable_fwaas="${ENABLE_FWAAS}" \ + --enable_secgroup="${ENABLE_SECGROUP}" --enable_fwaas="${ENABLE_FWAAS}" --expansion="${EXPANSION}" \ --rsa_file="$rsa_file" --enable_vpnaas="${ENABLE_VPNAAS}" --odl_l3_agent="${odl_l3_agent}" --moon="${moon}" --onos_sfc="${onos_sfc}" RET=$? diff --git a/deploy/host_baremetal.sh b/deploy/host_baremetal.sh index fc02875f..4c63f823 100755 --- a/deploy/host_baremetal.sh +++ b/deploy/host_baremetal.sh @@ -15,6 +15,14 @@ function reboot_hosts() { } function get_host_macs() { - machines=`echo $HOST_MACS | sed -e 's/,/'\',\''/g' -e 's/^/'\''/g' -e 's/$/'\''/g'` + if [[ "$EXPANSION" == "false" ]]; then + machines=`echo $HOST_MACS | sed -e 's/,/'\',\''/g' -e 's/^/'\''/g' -e 's/$/'\''/g'` + echo $machines > $WORK_DIR/switch_machines + else + machines_old=`cat $WORK_DIR/switch_machines` + machines_add=`echo $HOST_MACS | sed -e 's/,/'\',\''/g' -e 's/^/'\''/g' -e 's/$/'\''/g'` + echo $machines_add $machines_old > $WORK_DIR/switch_machines + machines=`echo $machines_add $machines_old|sed 's/ /,/g'` + fi echo $machines } diff --git a/deploy/host_virtual.sh b/deploy/host_virtual.sh index 97896bf0..2fab2c9d 100755 --- a/deploy/host_virtual.sh +++ b/deploy/host_virtual.sh @@ -60,14 +60,32 @@ function get_host_macs() { if [[ $REDEPLOY_HOST == "true" ]]; then mac_array=`cat $WORK_DIR/switch_machines` + machines=`echo $mac_array|sed 's/ /,/g'` else - chmod +x $mac_generator - mac_array=`$mac_generator $VIRT_NUMBER` - echo $mac_array > $WORK_DIR/switch_machines + if [[ -z $HOST_MACS ]]; then + if [[ "$EXPANSION" == "false" ]]; then + chmod +x $mac_generator + mac_array=`$mac_generator $VIRT_NUMBER` + echo $mac_array > $WORK_DIR/switch_machines + machines=`echo $mac_array|sed 's/ /,/g'` + else + machines_old=`cat $WORK_DIR/switch_machines` + chmod +x $mac_generator + machines_add=`$mac_generator $VIRT_NUMBER` + echo $machines_add $machines_old > $WORK_DIR/switch_machines + machines=`echo $machines_add $machines_old|sed 's/ /,/g'` + fi + else + if [[ "$EXPANSION" == "false" ]]; then + machines=`echo $HOST_MACS | sed -e 's/,/'\',\''/g' -e 's/^/'\''/g' -e 's/$/'\''/g'` + else + machines_old=`cat $WORK_DIR/switch_machines` + machines_add=`echo $HOST_MACS | sed -e 's/,/'\',\''/g' -e 's/^/'\''/g' -e 's/$/'\''/g'` + echo $machines_add $machines_old > $WORK_DIR/switch_machines + machines=`echo $machines_add $machines_old|sed 's/ /,/g'` + fi + fi fi - - machines=`echo $mac_array|sed 's/ /,/g'` - echo $machines } diff --git a/deploy/launch.sh b/deploy/launch.sh index f73b400a..976af3c0 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -31,39 +31,52 @@ source ${COMPASS_DIR}/deploy/compass_vm.sh source ${COMPASS_DIR}/deploy/deploy_host.sh ######################### main process -print_logo +if [[ "$EXPANSION" == "false" ]] +then -if [[ ! -z $VIRT_NUMBER ]];then - tear_down_machines -fi - -log_info "########## get host mac begin #############" -machines=`get_host_macs` -if [[ -z $machines ]]; then - log_error "get_host_macs failed" - exit 1 -fi + print_logo -export machines - -if [[ "$DEPLOY_COMPASS" == "true" ]]; then - if ! prepare_env;then - echo "prepare_env failed" - exit 1 + if [[ ! -z $VIRT_NUMBER ]];then + tear_down_machines fi - log_info "########## set up network begin #############" - if ! create_nets;then - log_error "create_nets failed" + log_info "########## get host mac begin #############" + machines=`get_host_macs` + if [[ -z $machines ]]; then + log_error "get_host_macs failed" exit 1 fi - if ! launch_compass;then - log_error "launch_compass failed" + export machines + + if [[ "$DEPLOY_COMPASS" == "true" ]]; then + if ! prepare_env;then + echo "prepare_env failed" + exit 1 + fi + + log_info "########## set up network begin #############" + if ! create_nets;then + log_error "create_nets failed" + exit 1 + fi + + if ! launch_compass;then + log_error "launch_compass failed" + exit 1 + fi + fi +else + machines=`get_host_macs` + if [[ -z $machines ]];then + log_error "get_host_macs failed" exit 1 fi + + log_info "deploy host macs: $machines" fi + if [[ -z "$REDEPLOY_HOST" || "$REDEPLOY_HOST" == "false" ]]; then if ! set_compass_machine; then log_error "set_compass_machine fail" 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/installationprocedure/bmdeploy.rst b/docs/installationprocedure/bmdeploy.rst index d08a8f8a..6ec70fa4 100644 --- a/docs/installationprocedure/bmdeploy.rst +++ b/docs/installationprocedure/bmdeploy.rst @@ -243,7 +243,7 @@ E.g. .. code-block:: bash - ########## Hardware Deploy Jumpserver PXE NIC ########## + ########## Hardware Deploy Jumphost PXE NIC ########## # you need comment out it when virtual deploy export INSTALL_NIC=eth1 diff --git a/docs/installationprocedure/expansion.rst b/docs/installationprocedure/expansion.rst new file mode 100644 index 00000000..1ffdafbd --- /dev/null +++ b/docs/installationprocedure/expansion.rst @@ -0,0 +1,302 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) by Weidong Shao (HUAWEI) and Justin Chi (HUAWEI) + +Expansion Guide +=============== + +Bare Metal Expansion +-------------------- + +Edit NETWORK File +~~~~~~~~~~~~~~~~~ + +The below file is the inventory template of deployment nodes: + + "./deploy/conf/hardware_environment/huawei-pod1/network.yml" + +You can edit the network.yml which you had edited before the first deployment. + +NOTE: +External subnet's ip_range should be changed as the first 6 IPs are already taken +by the first deployment. + +Edit DHA File +~~~~~~~~~~~~~ + +The below file is the inventory template of deployment nodes: + +"./deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml" + +You can write your own IPMI IP/User/Password/Mac address/roles reference to it. + + - name -- Host name for deployment node after installation. + + - ipmiIP -- IPMI IP address for deployment node. Make sure it can access + from Jumphost. + + - ipmiUser -- IPMI Username for deployment node. + + - ipmiPass -- IPMI Password for deployment node. + + - mac -- MAC Address of deployment node PXE NIC . + +**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 roles to servers** + +E.g. Only increase one compute node + +.. code-block:: yaml + + hosts: + - name: host6 + mac: 'E8:4D:D0:BA:60:45' + interfaces: + - eth1: '08:4D:D0:BA:60:44' + ipmiIp: 172.16.131.23 + roles: + - compute + + +E.g. Increase two compute nodes + +.. code-block:: yaml + + hosts: + - name: host6 + mac: 'E8:4D:D0:BA:60:45' + interfaces: + - eth1: '08:4D:D0:BA:60:44' + ipmiIp: 172.16.131.23 + roles: + - compute + + - name: host6 + mac: 'E8:4D:D0:BA:60:78' + interfaces: + - eth1: '08:4D:56:BA:60:83' + ipmiIp: 172.16.131.23 + roles: + - compute + +Start Expansion +~~~~~~~~~~~~~~~ + +1. Edit add.sh + +Set OS version and OpenStack version for deployment nodes. + Compass4nfv Colorado supports three OS version based openstack mitaka. + +E.g. + +.. code-block:: bash + + ########## 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 + +NOTE: +The OS version and OpenStack version should be same as the first deployment. + +Set ISO image that you want to deploy + +E.g. + +.. code-block:: bash + + # 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 + +Set scenario that you want to expansion + +E.g. + +.. code-block:: bash + + # DHA is your dha.yml's path + export DHA=./deploy/conf/hardware_environment/expansion-sample/hardware_cluster_expansion.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/hardware_environment/huawei-pod1/network.yml + +Comment out VIRT_NUMBER when bare metal expansion + +E.g. + +.. code-block:: bash + + #export VIRT_NUMBER=1 + +Set jumpserver PXE NIC + +E.g. + +.. code-block:: bash + + INSTALL_NIC=${INSTALL_NIC:-eth1} + +Check the environment variable. + +2. Run ``add.sh`` + +.. code-block:: bash + + ./add.sh + +Virtual Expansion +----------------- + +Edit NETWORK File +~~~~~~~~~~~~~~~~~ + +The below file is the inventory template of deployment nodes: + + "./deploy/conf/vm_environment/huawei-virtual1/network.yml" + +You can edit the network.yml which you had edited before the first deployment. + +NOTE: +External subnet's ip_range should be changed as the first 6 IPs are already taken +by the first deployment. + +Edit DHA File +~~~~~~~~~~~~~ + +The below file is the inventory template of deployment nodes: + +"./deploy/conf/vm_environment/virtual_cluster_expansion.yml" + +**Set TYPE and FLAVOR** + +E.g. + +.. code-block:: yaml + + TYPE: virtual + FLAVOR: cluster + +**Assignment of roles to servers** + +E.g. Only increase one compute node + +.. code-block:: yaml + + hosts: + - name: host6 + roles: + - compute + +E.g. Increase two compute nodes + +.. code-block:: yaml + + hosts: + - name: host6 + roles: + - compute + + - name: host7 + roles: + - compute + +Start Expansion +~~~~~~~~~~~~~~~ + +1. Edit add.sh + +Set OS version and OpenStack version for deployment nodes. + Compass4nfv Colorado supports three OS version based openstack mitaka. + +E.g. + +.. code-block:: bash + + ########## 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 + +NOTE: +The OS version and OpenStack version should be same as the first deployment. + +Set ISO image that you want to deploy + +E.g. + +.. code-block:: bash + + # 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 + +Set scenario that you want to expansion + +E.g. + +.. code-block:: bash + + # DHA is your dha.yml's path + export DHA=./deploy/conf/vm_environment/virtual_cluster_expansion.yml + + # NETWORK is your network.yml's path + export NETWORK=./deploy/conf/vm_environment/huawei-virtual1/network.yml + +Set nodes number need to expansion + +E.g. + +.. code-block:: bash + + export VIRT_NUMBER=1 + +Comment out NIC when virtual expansion + +E.g. + +.. code-block:: bash + + #INSTALL_NIC=${INSTALL_NIC:-eth1} + +Check the environment variable. + +2. Run ``add.sh`` + +.. code-block:: bash + + ./add.sh diff --git a/docs/installationprocedure/index.rst b/docs/installationprocedure/index.rst index 6416e35d..77439ae9 100644 --- a/docs/installationprocedure/index.rst +++ b/docs/installationprocedure/index.rst @@ -13,4 +13,5 @@ OPNFV(Colorado) Compass4nfv Installation Instructions installation.instruction.rst bmdeploy.rst vmdeploy.rst + expansion.rst references.rst diff --git a/docs/installationprocedure/installation.instruction.rst b/docs/installationprocedure/installation.instruction.rst index 9e552494..87c8a55c 100644 --- a/docs/installationprocedure/installation.instruction.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,7 +56,7 @@ 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(Include subfolders). +NOTE: PLEASE DO NOT GIT CLONE COMPASS4NFV IN ROOT DIRECTORY(INCLUDE SUBFOLDERS). To get stable /colorado release, you can use the following command: diff --git a/docs/installationprocedure/introduction.rst b/docs/installationprocedure/introduction.rst index d1c581e2..835a5788 100644 --- a/docs/installationprocedure/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. diff --git a/docs/installationprocedure/references.rst b/docs/installationprocedure/references.rst index 467bf08d..69ca4e7b 100644 --- a/docs/installationprocedure/references.rst +++ b/docs/installationprocedure/references.rst @@ -14,10 +14,12 @@ OPNFV `OPNFV Compass4nfv project page <https://wiki.opnfv.org/compass4nfv>`_ +`OPNFV Compass4nfv release notes <http://artifacts.opnfv.org/compass4nfv/colorado/docs/release-notes/index.html>`_ + 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/release-notes/index.rst b/docs/releasenotes/index.rst index 763280a5..e10b8372 100644 --- a/docs/release-notes/index.rst +++ b/docs/releasenotes/index.rst @@ -1,15 +1,13 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International Licence. .. http://creativecommons.org/licenses/by/4.0 -============================================ -OPNFV((Colorado) Compass4nfv Release Notes -============================================ - -Contents: +========================================= +OPNFV Colorado: Compass4nfv Release Notes +========================================= .. toctree:: :numbered: - :maxdepth: 4 + :maxdepth: 3 release-notes.rst diff --git a/docs/release-notes/release-notes.rst b/docs/releasenotes/release-notes.rst index fa8b5f0c..ff8ec500 100644 --- a/docs/release-notes/release-notes.rst +++ b/docs/releasenotes/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>`_ |