From cd0feb45a414980fdd7249c9cc4fc28a1213c769 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Mon, 13 Mar 2017 18:10:12 +0800 Subject: independent network for opera 1. launch open-o dockers directly on jump host instead of a vm 2. launch only one juju vm has both client and metadata function 3. add clearwater csar packages into opera repo 4. automatically deploy clearwater when key application in conf/application.yml has value clearwater 5. support keystone v3 Change-Id: Ic59f66d2cededf661aa7f6de2a40836ea40d8887 Signed-off-by: Harry Huang --- conf/admin-openrc.sh | 8 +++++++ conf/application.yml | 12 +++++++++++ conf/download.conf | 6 ------ conf/juju.conf | 15 +++++++++++++ conf/network.yml | 60 ---------------------------------------------------- conf/open-o.yml | 13 ++++++++++++ conf/openo-vm.yml | 15 ------------- 7 files changed, 48 insertions(+), 81 deletions(-) create mode 100755 conf/admin-openrc.sh create mode 100644 conf/application.yml delete mode 100644 conf/download.conf create mode 100644 conf/juju.conf delete mode 100644 conf/network.yml create mode 100644 conf/open-o.yml delete mode 100644 conf/openo-vm.yml (limited to 'conf') diff --git a/conf/admin-openrc.sh b/conf/admin-openrc.sh new file mode 100755 index 0000000..1f3309f --- /dev/null +++ b/conf/admin-openrc.sh @@ -0,0 +1,8 @@ +export OS_PROJECT_DOMAIN_NAME=default +export OS_USER_DOMAIN_NAME=default +export OS_USERNAME=admin +export OS_PASSWORD=console +export OS_PROJECT_NAME=admin +export OS_AUTH_URL=http://192.168.104.222:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME=RegionOne diff --git a/conf/application.yml b/conf/application.yml new file mode 100644 index 0000000..84f9eef --- /dev/null +++ b/conf/application.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2016-2017 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 +############################################################################## +application: + - name: clearwater + ns_pkg: pop_ns_juju.csar + vnf_pkg: JUJU_clearwater.csar diff --git a/conf/download.conf b/conf/download.conf deleted file mode 100644 index 76a7fc6..0000000 --- a/conf/download.conf +++ /dev/null @@ -1,6 +0,0 @@ -# iso and img conifg -OPENO_VM_ISO_URL=http://205.177.226.237:9999/CentOS-7-x86_64-Minimal-1511.iso -JUJU_IMG_NAME=(xenial_x86_64 trusty_x86_64 precise_x86_64) -JUJU_IMG_URL=(http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img \ - http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img \ - http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img) diff --git a/conf/juju.conf b/conf/juju.conf new file mode 100644 index 0000000..c62d4f8 --- /dev/null +++ b/conf/juju.conf @@ -0,0 +1,15 @@ +# juju conifg +JUJU_NET_GW=12.1.1.1 +JUJU_NET_CIDR=12.1.1.0/24 + +JUJU_VM_IMG=juju_image +JUJU_VM_IMG_URL=http://artifacts.opnfv.org/opera/opera/juju_xenial_x86_64.img + +JUJU_IMG_NAME=(xenial_x86_64 trusty_x86_64 precise_x86_64) +JUJU_IMG_URL=(http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img \ + http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img \ + http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img) + +CSAR_NAME=(JUJU_clearwater.csar pop_ns_juju.csar) +CSAR_URL=(http://artifacts.opnfv.org/opera/opera/csar/JUJU_clearwater.csar \ + http://artifacts.opnfv.org/opera/opera/csar/pop_ns_juju.csar) diff --git a/conf/network.yml b/conf/network.yml deleted file mode 100644 index bcf1e5a..0000000 --- a/conf/network.yml +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################## -# Copyright (c) 2016-2017 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 -############################################################################## ---- -openo_net: - openo_vm_ip: 192.168.104.50 - openo_vm_mask: 255.255.255.0 - openo_external_gw: 192.168.104.1 - openo_external_cidr: 192.168.104.0/24 - -openo_docker_net: - common_services_auth_ip: 192.168.104.51 - common_services_drivermanager_ip: 192.168.104.52 - common_services_extsys_ip: 192.168.104.53 - common_services_msb_ip: 192.168.104.54 - common_services_protocolstack_ip: 192.168.104.55 - common_services_wso2ext_ip: 192.168.104.56 - common_tosca_catalog_ip: 192.168.104.57 - common_tosca_inventory_ip: 192.168.104.58 - common_tosca_modeldesigner_ip: 192.168.104.59 - gso_service_gateway_ip: 192.168.104.60 - gso_service_manager_ip: 192.168.104.61 - nfvo_dac_ip: 192.168.104.62 - nfvo_driver_sdnc_zte_ip: 192.168.104.63 - nfvo_driver_vim_ip: 192.168.104.64 - nfvo_driver_vnfm_huawei_ip: 192.168.104.65 - nfvo_driver_vnfm_juju_ip: 192.168.104.66 - nfvo_driver_vnfm_zte_ip: 192.168.104.67 - nfvo_lcm_ip: 192.168.104.68 - nfvo_resmanagement_ip: 192.168.104.69 - nfvo_umc_ip: 192.168.104.70 - sdno_driver_huawei_l3vpn_ip: 192.168.104.71 - sdno_driver_huawei_openstack_ip: 192.168.104.72 - sdno_driver_huawei_overlay_ip: 192.168.104.73 - sdno_driver_huawei_servicechain_ip: 192.168.104.74 - sdno_driver_zte_sptn_ip: 192.168.104.75 - sdno_service_brs_ip: 192.168.104.76 - sdno_service_ipsec_ip: 192.168.104.77 - sdno_service_l2vpn_ip: 192.168.104.78 - sdno_service_l3vpn_ip: 192.168.104.79 - sdno_service_mss_ip: 192.168.104.80 - sdno_service_nslcm_ip: 192.168.104.81 - sdno_service_overlayvpn_ip: 192.168.104.82 - sdno_service_servicechain_ip: 192.168.104.83 - sdno_service_vpc_ip: 192.168.104.84 - sdno_service_vxlan_ip: 192.168.104.85 - common_tosca_aria_ip: 192.168.104.86 - sdno_driver_ct_te_ip: 192.168.104.87 - sdno_monitoring_ip: 192.168.104.88 - sdno_vsitemgr_ip: 192.168.104.89 - gso_gui_portal_ip: 192.168.104.90 - -juju_net: - juju_net_cidr: 12.1.1.0/24 - juju_net_gw: 12.1.1.1 diff --git a/conf/open-o.yml b/conf/open-o.yml new file mode 100644 index 0000000..1281376 --- /dev/null +++ b/conf/open-o.yml @@ -0,0 +1,13 @@ +--- +openo_version: 1.0.0 + +openo_net: + openo_ip: + +openo_docker_net: + common_services_msb_port: 80 + common_tosca_aria_port: 8204 + nfvo_driver_vnfm_juju_port: 8483 + nfvo_driver_vnfm_juju_mysql_port: 3306 + +application: diff --git a/conf/openo-vm.yml b/conf/openo-vm.yml deleted file mode 100644 index 25badad..0000000 --- a/conf/openo-vm.yml +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################## -# Copyright (c) 2016-2017 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 -############################################################################## ---- -openo: - tag: 1.0.0 - cpu: 4 - memory: 64 - disk: 100 - vnet: external -- cgit 1.2.3-korg