summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordongfeng <albert.dongfeng@huawei.com>2015-12-26 17:56:41 +0800
committerdongfeng <albert.dongfeng@huawei.com>2015-12-26 17:57:24 +0800
commitf954e4c9ea0edbb30a654ccdc71522bc171d1715 (patch)
tree11846de844d77914a930def7cad2e2b96b14c927
parent1e0aef4a4495b66122c00bbe698ec95d8d17fe5a (diff)
fix bug for ha-modekilo
Notes
Notes (review): Code-Review+2: Wenbin Wu <wuwenbin2@huawei.com> Workflow+1: Wenbin Wu <wuwenbin2@huawei.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 28 Dec 2015 13:03:00 +0000 Reviewed-on: https://review.openstack.org/261713 Project: openstack/fuel-plugin-onos Branch: refs/heads/master
-rw-r--r--README.md6
-rw-r--r--deployment_scripts/puppet/modules/onos/manifests/init.pp2
-rw-r--r--deployment_scripts/puppet/modules/onos/templates/netconfig.sh.erb2
-rw-r--r--metadata.yaml12
-rw-r--r--node_roles.yaml2
-rw-r--r--repositories/ubuntu/Packages.gzbin20 -> 20 bytes
-rw-r--r--repositories/ubuntu/Release2
7 files changed, 13 insertions, 13 deletions
diff --git a/README.md b/README.md
index 4190a98..d42cebc 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ All action is with Fuel UI wizard.
1101.Create a new environment. 1101.Create a new environment.
1112.Select 'onos plugin' on Settings tab. 1112.Select 'onos plugin' on Settings tab.
112 112
113 ? onos plugin 113 onos plugin
114 114
1153.Select a node with role 'controller' and others with role 'compute'. 1153.Select a node with role 'controller' and others with role 'compute'.
116Notice: In avoid of deployging failure, pay attentions to node configurations espacelly those for interfaces. 116Notice: In avoid of deployging failure, pay attentions to node configurations espacelly those for interfaces.
@@ -152,5 +152,5 @@ https://wiki.openstack.org/wiki/Fuel/Plugins).
152 152
153##Contributors## 153##Contributors##
154 154
155? Wu Wenbin <wuwenbin2@huawei.com> 1551. Wu Wenbin <wuwenbin2@huawei.com>
156? Zhang Haoyu <zhanghaoyu7@huawei.com> 1562. Zhang Haoyu <zhanghaoyu7@huawei.com>
diff --git a/deployment_scripts/puppet/modules/onos/manifests/init.pp b/deployment_scripts/puppet/modules/onos/manifests/init.pp
index 6557524..d974e3b 100644
--- a/deployment_scripts/puppet/modules/onos/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/onos/manifests/init.pp
@@ -14,5 +14,5 @@ $karaf_dist = 'apache-karaf-3.0.3'
14$onos_pkg_name = 'onos-1.3.0.tar.gz' 14$onos_pkg_name = 'onos-1.3.0.tar.gz'
15$jdk8_pkg_name = 'jdk-8u51-linux-x64.tar.gz' 15$jdk8_pkg_name = 'jdk-8u51-linux-x64.tar.gz'
16$onos_boot_features = 'config,standard,region,package,kar,ssh,management,webconsole,onos-api,onos-core,onos-incubator,onos-cli,onos-rest,onos-gui,onos-openflow-base,onos-openflow' 16$onos_boot_features = 'config,standard,region,package,kar,ssh,management,webconsole,onos-api,onos-core,onos-incubator,onos-cli,onos-rest,onos-gui,onos-openflow-base,onos-openflow'
17$onos_extra_features = 'ovsdb,vtnrsc,vtnweb,vtn,proxyarp' 17$onos_extra_features = 'ovsdb,vtn'
18} 18}
diff --git a/deployment_scripts/puppet/modules/onos/templates/netconfig.sh.erb b/deployment_scripts/puppet/modules/onos/templates/netconfig.sh.erb
index cd3d5b1..e223e1f 100644
--- a/deployment_scripts/puppet/modules/onos/templates/netconfig.sh.erb
+++ b/deployment_scripts/puppet/modules/onos/templates/netconfig.sh.erb
@@ -6,5 +6,5 @@ route add default gw <%= @gateway_ip %>
6ping -c 5 <%= @gateway_ip %> 6ping -c 5 <%= @gateway_ip %>
7gatewayMac=`arp -a <%= @gateway_ip -%> | awk '{print $4}'` 7gatewayMac=`arp -a <%= @gateway_ip -%> | awk '{print $4}'`
8/opt/onos/bin/onos "externalgateway-update -m $gatewayMac" 8/opt/onos/bin/onos "externalgateway-update -m $gatewayMac"
9ifconfig eth3 0 up 9ifconfig eth3 down
10route del default gw <%= @gateway_ip %> 10route del default gw <%= @gateway_ip %>
diff --git a/metadata.yaml b/metadata.yaml
index 7f44f5b..872a185 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,19 +1,19 @@
1# Plugin name 1# Plugin name
2name: onos_ha_modify 2name: onos
3# Human-readable name for your plugin 3# Human-readable name for your plugin
4title: onos ha modify 4title: onos plugin
5# Plugin version 5# Plugin version
6version: '0.7.1' 6version: '0.7.0'
7# Description 7# Description
8description: Enable to use plugin onos for Neutron 8description: 'Open Network Operating System (ONOS) is a typical SDN controller. Web-ui: http://horizon_ip:8181/onos/ui.'
9# Required fuel version 9# Required fuel version
10fuel_version: ['7.0'] 10fuel_version: ['7.0']
11# Specify license of your plugin 11# Specify license of your plugin
12licenses: ['Apache License Version 2.0'] 12licenses: ['Apache License Version 2.0']
13# Specify author or company name 13# Specify author or company name
14authors: ['Specify author or company name'] 14authors: ['Wu Wenbin, Huawei']
15# A link to the plugin's page 15# A link to the plugin's page
16homepage: 'https://github.com/openstack/fuel-plugins' 16homepage: 'https://github.com/openstack/fuel-plugins-onos'
17# Specify a group which your plugin implements, possible options: 17# Specify a group which your plugin implements, possible options:
18# network, storage, storage::cinder, storage::glance, hypervisor 18# network, storage, storage::cinder, storage::glance, hypervisor
19groups: ['network'] 19groups: ['network']
diff --git a/node_roles.yaml b/node_roles.yaml
index e9ec619..f36f50a 100644
--- a/node_roles.yaml
+++ b/node_roles.yaml
@@ -1,5 +1,5 @@
1onos: 1onos:
2 name: "onos controller" 2 name: "onos"
3 description: "sdn controller" 3 description: "sdn controller"
4 has_primary: false 4 has_primary: false
5 public_ip_required: false 5 public_ip_required: false
diff --git a/repositories/ubuntu/Packages.gz b/repositories/ubuntu/Packages.gz
index 7958774..8e8424e 100644
--- a/repositories/ubuntu/Packages.gz
+++ b/repositories/ubuntu/Packages.gz
Binary files differ
diff --git a/repositories/ubuntu/Release b/repositories/ubuntu/Release
index 3b94900..ac37f55 100644
--- a/repositories/ubuntu/Release
+++ b/repositories/ubuntu/Release
@@ -1,2 +1,2 @@
1Label: onos_ha_modify 1Label: onos
2Version: 0.7 2Version: 0.7