From 524fea7f6eacfa6a102614b7fb4c66e1be1b8287 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Mon, 13 Mar 2017 20:22:47 +0800 Subject: update opera related files 1. update opera_adapter.py to sync new opera config 2. modify all os-nosdn-openo-ha.yml, add open-o version and vnf type 3. modify all network_openo.yml, using only one external ip and assign open-o docker ips Change-Id: Iadcba8cc2fc17ddf32dfea9fe52c471a6bfadde8 Signed-off-by: Harry Huang --- .../hardware_environment/intel-pod8/network_openo.yml | 19 +++++-------------- .../intel-pod8/os-nosdn-openo-ha.yml | 8 ++++++-- 2 files changed, 11 insertions(+), 16 deletions(-) (limited to 'deploy/conf/hardware_environment/intel-pod8') diff --git a/deploy/conf/hardware_environment/intel-pod8/network_openo.yml b/deploy/conf/hardware_environment/intel-pod8/network_openo.yml index 48c47f7d..12e40afb 100644 --- a/deploy/conf/hardware_environment/intel-pod8/network_openo.yml +++ b/deploy/conf/hardware_environment/intel-pod8/network_openo.yml @@ -83,6 +83,11 @@ public_vip: netmask: "24" interface: external +openo_net: + openo_ip: 10.8.15.50 + openo_docker_gw: 172.11.1.1 + openo_docker_cidr: 172.11.1.0/24 + onos_nic: eth4 public_net_info: enable: "True" @@ -98,17 +103,3 @@ public_net_info: floating_ip_cidr: "10.8.15.0/24" floating_ip_start: "10.8.15.100" floating_ip_end: "10.8.15.200" - -openo_net: - openo_vm_ip: "10.8.15.50" - openo_vm_mask: "255.255.255.0" - openo_external_gw: "10.8.15.1" - openo_external_cidr: "10.8.15.0/24" - -openo_docker_net: - docker_ip_start: "10.8.15.51" - docker_ip_end: "10.8.15.90" - -juju_net: - juju_net_cidr: "12.1.1.0/24" - juju_net_gw: "12.1.1.1" diff --git a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-openo-ha.yml index f70414cf..6d28a49e 100644 --- a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-openo-ha.yml +++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-openo-ha.yml @@ -17,8 +17,12 @@ ipmiPass: root ipmiVer: '1.0' deploy_options: - - orchestrator: open-o - - application: clearwater + orchestrator: + type: open-o + version: 1.0.0 + + vnf: + type: hosts: - name: host1 -- cgit 1.2.3-korg