diff options
| -rwxr-xr-x | ci/deploy/deploy.sh | 2 | ||||
| -rwxr-xr-x | code/install_interface_patch.sh | 2 | ||||
| -rwxr-xr-x | code/makefile_patch.sh | 2 | ||||
| -rw-r--r-- | deploy/tempest.py | 30 | ||||
| -rw-r--r-- | docs/installationprocedure/vmdeploy.rst | 65 |
5 files changed, 68 insertions, 33 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 596e4aa8..e2923a1d 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -331,7 +331,7 @@ else fi echo "====== prepare host and pxe ======" -ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --host 'yes' --isbare $IS_BARE" +ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --host 'yes' --isbare $IS_BARE --scenario $DEPLOY_SCENARIO" if [ $IS_BARE == 0 ];then echo "====== daisy virtual-deploy operating system and openstack ======" diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh index 312b82c7..68a1e789 100755 --- a/code/install_interface_patch.sh +++ b/code/install_interface_patch.sh @@ -9,7 +9,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## imagebranch="ocata" -imageversion="170420124331" +imageversion="170621131826" imageserver="http://120.24.17.215" imagedir="/var/lib/daisy/versionfile/kolla" imagename="kolla-image-$imagebranch-$imageversion.tgz" diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh index 7d6c79bc..20b3cf42 100755 --- a/code/makefile_patch.sh +++ b/code/makefile_patch.sh @@ -13,7 +13,7 @@ TOOLS_PATH=$1 CACHE_PATH=/home/cache imagebranch="ocata" -imageversion="170420124331" +imageversion="170621131826" imageserver="http://120.24.17.215" imagename="kolla-image-$imagebranch-$imageversion.tgz" diff --git a/deploy/tempest.py b/deploy/tempest.py index 4f75ee77..b1e02763 100644 --- a/deploy/tempest.py +++ b/deploy/tempest.py @@ -35,6 +35,8 @@ _CLI_OPTS = [ help='install daisy'), cfg.IntOpt('isbare', help='deploy environment'), + cfg.StrOpt('scenario', + help='deploy scenario'), ] @@ -100,6 +102,10 @@ def prepare_install(): protocol_type = None enable_cinder_backend(cluster_id, service_name, ceph_disk_name, protocol_type) + if 'scenario' in conf and 'odl_l3' in conf['scenario']: + enable_opendaylight(cluster_id, 'odl_l3') + elif 'scenario' in conf and 'odl_l2' in conf['scenario']: + enable_opendaylight(cluster_id, 'odl_l2') if 'isbare' in conf and conf['isbare'] == 0: install_os_for_vm_step1(cluster_id) else: @@ -240,5 +246,29 @@ def enable_cinder_backend(cluster_id, service_name, disk_name, protocol_type): print e +def enable_opendaylight(cluster_id, layer): + role_meta = {'filters': {'cluster_id': cluster_id}} + role_list_generator = client.roles.list(**role_meta) + lb_role_id = [role.id for role in role_list_generator if + role.name == "CONTROLLER_LB"][0] + odl_layer = 'l3' + if 'odl_l3' == layer: + odl_layer = 'l3' + elif 'odl_l2' == layer: + odl_layer = 'l2' + neutron_backend_info = { + 'neutron_backends_array': [{'zenic_ip': '', + 'sdn_controller_type': 'opendaylight', + 'zenic_port': '', + 'zenic_user_password': '', + 'neutron_agent_type': '', + 'zenic_user_name': '', + 'enable_l2_or_l3': odl_layer}]} + try: + client.roles.update(lb_role_id, **neutron_backend_info) + except Exception as e: + print e + + if __name__ == "__main__": prepare_install() diff --git a/docs/installationprocedure/vmdeploy.rst b/docs/installationprocedure/vmdeploy.rst index 296af6b9..6c57ded8 100644 --- a/docs/installationprocedure/vmdeploy.rst +++ b/docs/installationprocedure/vmdeploy.rst @@ -70,53 +70,58 @@ You can write your own reference into it. .. code-block:: console - +------------+------------------------------+ + +-B/M--------+------------------------------+ |Jumperserver+ | +------------+ +--+ | | | | | - | +------------+ | | | + | +-V/M--------+ | | | | | Daisyserver+------+ | | | +------------+ | | | | | | | - | | | | - | | | | - | +------------+ | | | - | +--------+ Controller +------+ | | - | | +------------+ | | | - | | | | | - | | | | | - | | | | | - | | +------------+ | | | - | | | Compute1 +------+ | | - | | +------------+ | | | - | | | | | - | | | | | - | | | | | - | | +------------+ | | | - | | | Compute2 +------+ | | - | | +------------+ | | | - | | | | | - | | | | | - | | | | | - | | | | | - | | ++-+ | - | | ^ | + | +--+ | | | + | | | +-V/M--------+ | | | + | | +-------+ Controller +------+ | | + | | | | ODL(Opt.) | | | | + | | | | Network | | | | + | | | | Ceph1 | | | | + | | | +------------+ | | | + | | | | | | + | | | | | | + | | | | | | + | | | +-V/M--------+ | | | + | | +-------+ Compute1 +------+ | | + | | | | Ceph2 | | | | + | | | +------------+ | | | + | | | | | | + | | | | | | + | | | | | | + | | | +-V/M--------+ | | | + | | +-------+ Compute2 +------+ | | + | | | | Ceph3 | | | | + | | | +------------+ | | | + | | | | | | + | | | | | | + | | | | | | + | +--+ +--+ | + | ^ ^ | | | | | | | | | - | ++--------------------------+ | | - | | | | | + | /---------------------------\ | | | | External Network | | | - | +---------------------------+ | | - | +-----------------------+---+ | + | \---------------------------/ | | + | /-----------------------+---\ | | | Installation Network | | | | Public/Private API | | | | Internet Access | | | | Tenant Network | | - | +---------------------------+ | + | | Storage Network | | + | \---------------------------/ | +-------------------------------------------+ +Note: For Flat External networks(which is used by default), a physical interface is needed on each compute node for ODL NetVirt recent versions. + Start Deployment (Virtual Deployment) ------------------------------------- |