diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-03-13 20:22:47 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2017-03-18 06:00:23 +0000 |
| commit | 4b003c873eac38684844a4c2b19665c2f0362843 (patch) | |
| tree | 3dd5d4d624525e3d9fa07b2b0c29677b8e20a67d /deploy/conf/hardware_environment/huawei-pod1 | |
| parent | 07e00673db9a395326ae97d2725ce9be9e47e53d (diff) | |
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 <huangxiangyu5@huawei.com>
(cherry picked from commit 524fea7f6eacfa6a102614b7fb4c66e1be1b8287)
Diffstat (limited to 'deploy/conf/hardware_environment/huawei-pod1')
| -rw-r--r-- | deploy/conf/hardware_environment/huawei-pod1/network_openo.yml | 21 | ||||
| -rw-r--r-- | deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml | 10 |
2 files changed, 13 insertions, 18 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network_openo.yml b/deploy/conf/hardware_environment/huawei-pod1/network_openo.yml index 80b80fc6..6fc5bc45 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/network_openo.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/network_openo.yml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 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 @@ -83,6 +83,11 @@ public_vip: netmask: "24" interface: external +openo_net: + openo_ip: 192.168.10.50 + openo_docker_gw: 172.11.1.1 + openo_docker_cidr: 172.11.1.0/24 + onos_nic: eth2 public_net_info: enable: "True" @@ -98,17 +103,3 @@ public_net_info: floating_ip_cidr: "192.168.10.0/24" floating_ip_start: "192.168.10.100" floating_ip_end: "192.168.10.200" - -openo_net: - openo_vm_ip: "192.168.10.50" - openo_vm_mask: "255.255.255.0" - openo_external_gw: "192.168.10.1" - openo_external_cidr: "192.168.10.0/24" - -openo_docker_net: - docker_ip_start: "192.168.10.51" - docker_ip_end: "192.168.10.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/huawei-pod1/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml index 6eb50a29..0d403bc2 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 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 @@ -16,8 +16,12 @@ ipmiUser: root ipmiVer: '2.0' deploy_options: - - orchestrator: open-o - - application: clearwater + orchestrator: + type: open-o + version: 1.0.0 + + vnf: + type: hosts: - name: host1 |