summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordongfeng <albert.dongfeng@huawei.com>2015-12-10 15:59:12 +0800
committerdongfeng <albert.dongfeng@huawei.com>2015-12-10 16:00:12 +0800
commit2fc5eba431d6aedda9ca44fdc7dbd3211022b64d (patch)
tree78ee6150219f8059ec01454889f6b57f681f0ea7
parentd4fb381a207c964cd288e62b46c90d2a13e62eec (diff)
fuel plugin onos for 6.1
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, 21 Dec 2015 03:44:07 +0000 Reviewed-on: https://review.openstack.org/255719 Project: openstack/fuel-plugin-onos Branch: refs/heads/master
-rw-r--r--README.md11
-rw-r--r--deployment_scripts/puppet/manifests/neutron.pp15
-rw-r--r--deployment_scripts/puppet/manifests/ovs.pp10
-rw-r--r--deployment_scripts/puppet/manifests/preliminary.pp7
-rw-r--r--deployment_scripts/puppet/modules/onos/files/jdk-8u51-linux-x64.tar.gzbin0 -> 173281904 bytes
-rw-r--r--deployment_scripts/puppet/modules/onos/files/mechanism_onos.py167
-rw-r--r--deployment_scripts/puppet/modules/onos/files/net_config.sh2
-rw-r--r--deployment_scripts/puppet/modules/onos/files/onos_config.sh45
-rw-r--r--deployment_scripts/puppet/modules/onos/manifests/config.pp28
-rw-r--r--deployment_scripts/puppet/modules/onos/manifests/install.pp18
-rw-r--r--deployment_scripts/puppet/modules/onos/manifests/service.pp16
-rw-r--r--metadata.yaml8
-rwxr-xr-xpre_build_hook4
-rw-r--r--repositories/centos/repodata/2daa2f7a904d6ae04d81abc07d2ecb3bc3d8244a1e78afced2c94994f1b5f3ee-filelists.sqlite.bz2bin0 -> 591 bytes
-rw-r--r--repositories/centos/repodata/401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93-filelists.xml.gzbin0 -> 123 bytes
-rw-r--r--repositories/centos/repodata/6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670-other.xml.gzbin0 -> 123 bytes
-rw-r--r--repositories/centos/repodata/ad36b2b9cd3689c29dcf84226b0b4db80633c57d91f50997558ce7121056e331-primary.sqlite.bz2bin0 -> 1130 bytes
-rw-r--r--repositories/centos/repodata/d5630fb9d7f956c42ff3962f2e6e64824e5df7edff9e08adf423d4c353505d69-other.sqlite.bz2bin0 -> 570 bytes
-rw-r--r--repositories/centos/repodata/dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9-primary.xml.gzbin0 -> 134 bytes
-rw-r--r--repositories/centos/repodata/repomd.xml55
-rw-r--r--repositories/ubuntu/Packages.gzbin0 -> 20 bytes
-rw-r--r--repositories/ubuntu/Release2
22 files changed, 386 insertions, 2 deletions
diff --git a/README.md b/README.md
index b24c904..439ef02 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,11 @@ This plugin will install [ Open Network Operating System (ONOS) controller](http
8##Notification## 8##Notification##
9 9
10 10
11<<<<<<< HEAD
11* Fuel opentack version should be after 6.1. 12* Fuel opentack version should be after 6.1.
13=======
14* Fuel opentack version should be 6.1.
15>>>>>>> 22530ae... fuel plugin onos for 6.1
12* Only supports the environment with network type: Neutron. 16* Only supports the environment with network type: Neutron.
13* Live migration is supported. 17* Live migration is supported.
14* Cluster of onos is supported. 18* Cluster of onos is supported.
@@ -58,7 +62,11 @@ Notice: Above steps aren't liminited with the environment of master, you can als
58 62
59 id | name | version | package_version 63 id | name | version | package_version
60 ---|--------|---------|---------------- 64 ---|--------|---------|----------------
65<<<<<<< HEAD
61 1 | onos | 0.1.1 | 2.0.0 66 1 | onos | 0.1.1 | 2.0.0
67=======
68 1 | onos | 0.6.1 | 2.0.0
69>>>>>>> 22530ae... fuel plugin onos for 6.1
62 70
63 71
647. Check if the plugin is enabled on the settings table. 727. Check if the plugin is enabled on the settings table.
@@ -120,4 +128,7 @@ https://wiki.openstack.org/wiki/Fuel/Plugins).
120? Wu Wenbin <wuwenbin2@huawei.com> 128? Wu Wenbin <wuwenbin2@huawei.com>
121? Zhang Haoyu <zhanghaoyu7@huawei.com> 129? Zhang Haoyu <zhanghaoyu7@huawei.com>
122 130
131<<<<<<< HEAD
123 132
133=======
134>>>>>>> 22530ae... fuel plugin onos for 6.1
diff --git a/deployment_scripts/puppet/manifests/neutron.pp b/deployment_scripts/puppet/manifests/neutron.pp
index 1f62bbb..6cc38e1 100644
--- a/deployment_scripts/puppet/manifests/neutron.pp
+++ b/deployment_scripts/puppet/manifests/neutron.pp
@@ -2,6 +2,7 @@ include onos
2 2
3Exec { path => [ "/bin/", "/sbin/" , "/usr/bin/", "/usr/sbin/" ] } 3Exec { path => [ "/bin/", "/sbin/" , "/usr/bin/", "/usr/sbin/" ] }
4neutron_plugin_ml2 { 4neutron_plugin_ml2 {
5<<<<<<< HEAD
5 'ml2/mechanism_drivers': value => 'onos'; 6 'ml2/mechanism_drivers': value => 'onos';
6 'ml2/tenant_network_types': value => 'vxlan'; 7 'ml2/tenant_network_types': value => 'vxlan';
7 'ml2_onos/password': value => 'admin'; 8 'ml2_onos/password': value => 'admin';
@@ -9,6 +10,20 @@ neutron_plugin_ml2 {
9 'ml2_onos/url_path': value => "http://${onos::manager_ip}:8181/onos/vtn"; 10 'ml2_onos/url_path': value => "http://${onos::manager_ip}:8181/onos/vtn";
10}-> 11}->
11 12
13=======
14 'ml2/mechanism_drivers': value => 'onos_ml2';
15 'ml2/tenant_network_types': value => 'vxlan';
16 'onos/password': value => 'admin';
17 'onos/username': value => 'admin';
18 'onos/url_path': value => "http://${onos::manager_ip}:8181/onos/vtn";
19}->
20
21neutron_config { 'DEFAULT/service_plugins':
22 value => 'onos_router';
23}->
24
25
26>>>>>>> 22530ae... fuel plugin onos for 6.1
12exec{ 'Configure Neutron3': 27exec{ 'Configure Neutron3':
13 command => "mysql -e 'drop database if exists neutron;'; 28 command => "mysql -e 'drop database if exists neutron;';
14 mysql -e 'create database neutron character set utf8;'; 29 mysql -e 'create database neutron character set utf8;';
diff --git a/deployment_scripts/puppet/manifests/ovs.pp b/deployment_scripts/puppet/manifests/ovs.pp
index ebd5fdf..0e226bc 100644
--- a/deployment_scripts/puppet/manifests/ovs.pp
+++ b/deployment_scripts/puppet/manifests/ovs.pp
@@ -26,7 +26,17 @@ service {'neutron-server':
26cs_resource { "p_${neutron_ovs_agent}": 26cs_resource { "p_${neutron_ovs_agent}":
27 ensure => absent, 27 ensure => absent,
28 before => Service["shut down and disable Neutron's agent services"], 28 before => Service["shut down and disable Neutron's agent services"],
29<<<<<<< HEAD
29 }} 30 }}
31=======
32 }->
33
34cs_resource { "p_neutron-l3-agent":
35 ensure => absent,
36 }
37}
38
39>>>>>>> 22530ae... fuel plugin onos for 6.1
30else{ 40else{
31exec{'remove neutron-openvswitch-agent auto start': 41exec{'remove neutron-openvswitch-agent auto start':
32 command => "touch /opt/service; 42 command => "touch /opt/service;
diff --git a/deployment_scripts/puppet/manifests/preliminary.pp b/deployment_scripts/puppet/manifests/preliminary.pp
index 0c6e2c1..b9038fe 100644
--- a/deployment_scripts/puppet/manifests/preliminary.pp
+++ b/deployment_scripts/puppet/manifests/preliminary.pp
@@ -20,3 +20,10 @@ file { '/opt/onos/':
20 group => 'onos', 20 group => 'onos',
21} 21}
22 22
23<<<<<<< HEAD
24=======
25package { 'install git':
26 ensure => installed,
27 name => "git",
28}
29>>>>>>> 22530ae... fuel plugin onos for 6.1
diff --git a/deployment_scripts/puppet/modules/onos/files/jdk-8u51-linux-x64.tar.gz b/deployment_scripts/puppet/modules/onos/files/jdk-8u51-linux-x64.tar.gz
new file mode 100644
index 0000000..908538e
--- /dev/null
+++ b/deployment_scripts/puppet/modules/onos/files/jdk-8u51-linux-x64.tar.gz
Binary files differ
diff --git a/deployment_scripts/puppet/modules/onos/files/mechanism_onos.py b/deployment_scripts/puppet/modules/onos/files/mechanism_onos.py
new file mode 100644
index 0000000..0fc5d02
--- /dev/null
+++ b/deployment_scripts/puppet/modules/onos/files/mechanism_onos.py
@@ -0,0 +1,167 @@
1# Copyright (c) 2015 Huawei Technologies India Pvt Ltd
2# All Rights Reserved.
3#
4# Licensed under the Apache License, Version 2.0 (the "License"); you may
5# not use this file except in compliance with the License. You may obtain
6# a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13# License for the specific language governing permissions and limitations
14# under the License.
15
16import requests
17
18from oslo.config import cfg
19from neutron.openstack.common import log as logging
20from neutron.openstack.common import jsonutils
21from neutron.plugins.common import constants
22from neutron.common import constants as n_const
23from neutron.extensions import portbindings
24from neutron.plugins.ml2 import driver_api as api
25
26LOG = logging.getLogger(__name__)
27
28ONOS_DRIVER_OPTS = [
29 cfg.StrOpt('url_path',
30 default='',
31 help=_('ONOS ReST interface URL')),
32 cfg.StrOpt('username',
33 default='',
34 help=_('Username for authentication.')),
35 cfg.StrOpt('password',
36 default='',
37 secret=True, # do not expose value in the logs
38 help=_('Password for authentication.'))
39]
40
41cfg.CONF.register_opts(ONOS_DRIVER_OPTS, "ml2_onos")
42
43
44def send_msg(onos_path, onos_auth, msg_type, entity_path, entity=None):
45 """Send message to the ONOS controller."""
46
47 body = jsonutils.dumps(entity, indent=2) if entity else None
48 path = '/'.join([onos_path, entity_path])
49 LOG.debug("Sending MSG (%(msg)s) URL (%(path)s) JSON (%(entity)s)",
50 {'msg': msg_type, 'path': path, 'entity': body})
51
52 hdr = {'Content-Type': 'application/json'}
53 req = requests.request(method=msg_type, url=path,
54 headers=hdr, data=body,
55 auth=onos_auth)
56 req.raise_for_status()
57
58
59class ONOSMechanismDriver(api.MechanismDriver):
60
61 """Open Networking Operating System ML2 Driver for Neutron.
62
63 Code which makes communication between ONOS and OpenStack Neutron
64 possible.
65 """
66 def __init__(self):
67 conf = cfg.CONF.ml2_onos
68 self.onos_path = conf.url_path
69 self.onos_auth = (conf.username, conf.password)
70 self.vif_type = portbindings.VIF_TYPE_OVS
71 self.vif_details = {portbindings.CAP_PORT_FILTER: True}
72
73 def initialize(self):
74 # No action required as of now. Can be extended in
75 # the future if required.
76 pass
77
78 #@log_helpers.log_method_call
79 def create_network_postcommit(self, context):
80 entity_path = 'networks/'
81 resource = context.current.copy()
82 send_msg(self.onos_path, self.onos_auth, 'post',
83 entity_path, {'network': resource})
84
85 #@log_helpers.log_method_call
86 def update_network_postcommit(self, context):
87 entity_path = 'networks/' + context.current['id']
88 resource = context.current.copy()
89 send_msg(self.onos_path, self.onos_auth, 'put',
90 entity_path, {'network': resource})
91
92 #@log_helpers.log_method_call
93 def delete_network_postcommit(self, context):
94 entity_path = 'networks/' + context.current['id']
95 send_msg(self.onos_path, self.onos_auth, 'delete',
96 entity_path)
97
98 #@log_helpers.log_method_call
99 def create_subnet_postcommit(self, context):
100 entity_path = 'subnets/'
101 resource = context.current.copy()
102 send_msg(self.onos_path, self.onos_auth, 'post',
103 entity_path, {'subnet': resource})
104
105 #@log_helpers.log_method_call
106 def update_subnet_postcommit(self, context):
107 entity_path = 'subnets/' + context.current['id']
108 resource = context.current.copy()
109 send_msg(self.onos_path, self.onos_auth, 'put',
110 entity_path, {'subnet': resource})
111
112 #@log_helpers.log_method_call
113 def delete_subnet_postcommit(self, context):
114 entity_path = 'subnets/' + context.current['id']
115 send_msg(self.onos_path, self.onos_auth, 'delete',
116 entity_path)
117
118 #@log_helpers.log_method_call
119 def create_port_postcommit(self, context):
120 entity_path = 'ports/'
121 resource = context.current.copy()
122 send_msg(self.onos_path, self.onos_auth, 'post',
123 entity_path, {'port': resource})
124
125 #@log_helpers.log_method_call
126 def update_port_postcommit(self, context):
127 entity_path = 'ports/' + context.current['id']
128 resource = context.current.copy()
129 send_msg(self.onos_path, self.onos_auth, 'put',
130 entity_path, {'port': resource})
131
132 #@log_helpers.log_method_call
133
134 def delete_port_postcommit(self, context):
135 entity_path = 'ports/' + context.current['id']
136 send_msg(self.onos_path, self.onos_auth, 'delete',
137 entity_path)
138 def bind_port(self, context):
139 LOG.debug("Attempting to bind port %(port)s on "
140 "network %(network)s",
141 {'port': context.current['id'],
142 'network': context.network.current['id']})
143 for segment in context.network.network_segments:
144 if self.check_segment(segment):
145 context.set_binding(segment[api.ID],
146 self.vif_type,
147 self.vif_details,
148 status=n_const.PORT_STATUS_ACTIVE)
149 LOG.debug("Bound using segment: %s", segment)
150 return
151 else:
152 LOG.debug("Refusing to bind port for segment ID %(id)s, "
153 "segment %(seg)s, phys net %(physnet)s, and "
154 "network type %(nettype)s",
155 {'id': segment[api.ID],
156 'seg': segment[api.SEGMENTATION_ID],
157 'physnet': segment[api.PHYSICAL_NETWORK],
158 'nettype': segment[api.NETWORK_TYPE]})
159 def check_segment(self, segment):
160 """Verify a segment is valid for the ONOS MechanismDriver.
161
162 Verify the requested segment is supported by ONOS and return True or
163 False to indicate this to callers.
164 """
165 network_type = segment[api.NETWORK_TYPE]
166 return network_type in [constants.TYPE_LOCAL, constants.TYPE_GRE,
167 constants.TYPE_VXLAN, constants.TYPE_VLAN]
diff --git a/deployment_scripts/puppet/modules/onos/files/net_config.sh b/deployment_scripts/puppet/modules/onos/files/net_config.sh
new file mode 100644
index 0000000..0083b7d
--- /dev/null
+++ b/deployment_scripts/puppet/modules/onos/files/net_config.sh
@@ -0,0 +1,2 @@
1ifconfig eth3 172.16.0.125/24 up arp
2route add default gw 172.16.0.1
diff --git a/deployment_scripts/puppet/modules/onos/files/onos_config.sh b/deployment_scripts/puppet/modules/onos/files/onos_config.sh
index 5cb20f1..a4c4650 100644
--- a/deployment_scripts/puppet/modules/onos/files/onos_config.sh
+++ b/deployment_scripts/puppet/modules/onos/files/onos_config.sh
@@ -1,6 +1,51 @@
1<<<<<<< HEAD
1#!bin/sh 2#!bin/sh
2 3
3 echo 'export ONOS_OPTS=debug' > /opt/onos/options; 4 echo 'export ONOS_OPTS=debug' > /opt/onos/options;
4 echo 'export ONOS_USER=root' >> /opt/onos/options; 5 echo 'export ONOS_USER=root' >> /opt/onos/options;
5 mkdir /opt/onos/var; 6 mkdir /opt/onos/var;
6 mkdir /opt/onos/config; 7 mkdir /opt/onos/config;
8=======
9#!/bin/bash
10echo 'export ONOS_OPTS=debug' > /opt/onos/options;
11echo 'export ONOS_USER=root' >> /opt/onos/options;
12mkdir /opt/onos/var;
13mkdir /opt/onos/config;
14
15#jdk config
16
17mkdir /usr/lib/jvm/
18tar -xzf /opt/jdk-8u*-linux-x64.tar.gz -C /usr/lib/jvm/
19mv /usr/lib/jvm/jdk1.8.0_* /usr/lib/jvm/java-8-oracle
20
21touch /etc/profile.d/jdk.csh
22cat <<EOT>> /etc/profile.d/jdk.csh
23setenv J2SDKDIR /usr/lib/jvm/java-8-oracle
24setenv J2REDIR /usr/lib/jvm/java-8-oracle/jre
25setenv PATH ${PATH}:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin
26setenv JAVA_HOME /usr/lib/jvm/java-8-oracle
27setenv DERBY_HOME /usr/lib/jvm/java-8-oracle/db
28EOT
29
30touch /etc/profile.d/jdk.sh
31cat <<EOT>> /etc/profile.d/jdk.sh
32export J2SDKDIR=/usr/lib/jvm/java-8-oracle
33export J2REDIR=/usr/lib/jvm/java-8-oracle/jre
34export PATH=$PATH:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin
35export JAVA_HOME=/usr/lib/jvm/java-8-oracle
36export DERBY_HOME=/usr/lib/jvm/java-8-oracle/db
37EOT
38
39chmod +x /etc/profile.d/jdk*
40
41#mv /opt/mechanism_onos.py /usr/lib/python*/*packages/neutron/plugins/ml2/drivers/
42#sed -i '/neutron.ml2.mechanism_drivers]/a\onos = neutron.plugins.ml2.drivers.mechanism_onos:ONOSMechanismDriver' /usr/lib/python*/*packages/neutron-*egg-info/entry_points.txt
43
44
45cd /opt
46tar xf /opt/networking-onos.tar
47cd networking-onos
48python setup.py install
49
50
51>>>>>>> 22530ae... fuel plugin onos for 6.1
diff --git a/deployment_scripts/puppet/modules/onos/manifests/config.pp b/deployment_scripts/puppet/modules/onos/manifests/config.pp
index ae267b4..40b3e68 100644
--- a/deployment_scripts/puppet/modules/onos/manifests/config.pp
+++ b/deployment_scripts/puppet/modules/onos/manifests/config.pp
@@ -8,10 +8,24 @@ $public_vip = hiera('public_vip')
8$management_vip = hiera('management_vip') 8$management_vip = hiera('management_vip')
9$controllers_names = $onos::controllers_names 9$controllers_names = $onos::controllers_names
10$controllers_ip = $onos::controllers_ip 10$controllers_ip = $onos::controllers_ip
11<<<<<<< HEAD
12=======
13$onos_pkg_name = $onos::onos_pkg_name
14$jdk8_pkg_name = $onos::jdk8_pkg_name
15>>>>>>> 22530ae... fuel plugin onos for 6.1
11 16
12Haproxy::Service { use_include => true } 17Haproxy::Service { use_include => true }
13Haproxy::Balancermember { use_include => true } 18Haproxy::Balancermember { use_include => true }
14 19
20<<<<<<< HEAD
21=======
22Exec{
23 path => "/usr/bin:/usr/sbin:/bin:/sbin",
24 timeout => 180,
25 logoutput => "true",
26}
27
28>>>>>>> 22530ae... fuel plugin onos for 6.1
15file{ '/opt/onos_config.sh': 29file{ '/opt/onos_config.sh':
16 source => "puppet:///modules/onos/onos_config.sh", 30 source => "puppet:///modules/onos/onos_config.sh",
17} -> 31} ->
@@ -20,6 +34,14 @@ exec{ 'install onos config':
20 rm -rf /opt/onos_config.sh;", 34 rm -rf /opt/onos_config.sh;",
21 path => "/usr/bin:/usr/sbin:/bin:/sbin", 35 path => "/usr/bin:/usr/sbin:/bin:/sbin",
22}-> 36}->
37<<<<<<< HEAD
38=======
39exec{ "clean used files":
40 command => "rm -rf /opt/$onos_pkg_name;
41 rm -rf /opt/$jdk8_pkg_name
42 rm -rf /root/.m2/*.tar"
43}->
44>>>>>>> 22530ae... fuel plugin onos for 6.1
23exec{ 'onos boot features': 45exec{ 'onos boot features':
24 command => "sed -i '/^featuresBoot=/c\featuresBoot=$onos_boot_features' $onos_home/$karaf_dist/etc/org.apache.karaf.features.cfg", 46 command => "sed -i '/^featuresBoot=/c\featuresBoot=$onos_boot_features' $onos_home/$karaf_dist/etc/org.apache.karaf.features.cfg",
25 path => "/usr/bin:/usr/sbin:/bin:/sbin", 47 path => "/usr/bin:/usr/sbin:/bin:/sbin",
@@ -71,4 +93,8 @@ haproxy::balancermember { 'onos':
71 define_cookies => 'true' 93 define_cookies => 'true'
72 } 94 }
73} 95}
74} \ No newline at end of file 96<<<<<<< HEAD
97}
98=======
99}
100>>>>>>> 22530ae... fuel plugin onos for 6.1
diff --git a/deployment_scripts/puppet/modules/onos/manifests/install.pp b/deployment_scripts/puppet/modules/onos/manifests/install.pp
index 1995208..c16d0ae 100644
--- a/deployment_scripts/puppet/modules/onos/manifests/install.pp
+++ b/deployment_scripts/puppet/modules/onos/manifests/install.pp
@@ -13,6 +13,7 @@ Exec{
13} 13}
14 14
15 15
16<<<<<<< HEAD
16 17
17 18
18file{ "/opt/$onos_pkg_name": 19file{ "/opt/$onos_pkg_name":
@@ -20,13 +21,26 @@ file{ "/opt/$onos_pkg_name":
20} -> 21} ->
21file{ '/opt/networking-onos.tar': 22file{ '/opt/networking-onos.tar':
22 source =>"puppet:///modules/onos/networking-onos.tar", 23 source =>"puppet:///modules/onos/networking-onos.tar",
24=======
25file{ "/opt/$onos_pkg_name":
26 source => "puppet:///modules/onos/$onos_pkg_name",
27} ->
28file{ '/opt/mechanism_onos.py':
29 source =>"puppet:///modules/onos/mechanism_onos.py",
30>>>>>>> 22530ae... fuel plugin onos for 6.1
23} -> 31} ->
24file{ "/opt/$jdk8_pkg_name": 32file{ "/opt/$jdk8_pkg_name":
25 source => "puppet:///modules/onos/$jdk8_pkg_name", 33 source => "puppet:///modules/onos/$jdk8_pkg_name",
26} -> 34} ->
35<<<<<<< HEAD
27file{ '/opt/install_jdk8.tar': 36file{ '/opt/install_jdk8.tar':
28 source => "puppet:///modules/onos/install_jdk8.tar", 37 source => "puppet:///modules/onos/install_jdk8.tar",
29} -> 38} ->
39=======
40file{ "/opt/networking-onos.tar":
41 source => "puppet:///modules/onos/networking-onos.tar",
42}
43>>>>>>> 22530ae... fuel plugin onos for 6.1
30file{ '/root/.m2/': 44file{ '/root/.m2/':
31 ensure => 'directory', 45 ensure => 'directory',
32 recurse => true, 46 recurse => true,
@@ -36,6 +50,7 @@ file{ '/root/.m2/repository.tar':
36} -> 50} ->
37exec{ "unzip packages": 51exec{ "unzip packages":
38 command => "tar -zvxf /opt/$onos_pkg_name -C $onos_home --strip-components 1 --no-overwrite-dir -k; 52 command => "tar -zvxf /opt/$onos_pkg_name -C $onos_home --strip-components 1 --no-overwrite-dir -k;
53<<<<<<< HEAD
39 tar vxf /opt/networking-onos.tar -C /opt; 54 tar vxf /opt/networking-onos.tar -C /opt;
40 tar xf /opt/install_jdk8.tar -C /opt; 55 tar xf /opt/install_jdk8.tar -C /opt;
41 tar xf /root/.m2/repository.tar -C /root/.m2/", 56 tar xf /root/.m2/repository.tar -C /root/.m2/",
@@ -49,5 +64,8 @@ exec{ "clean used files":
49 rm -rf /opt/install_jdk8; 64 rm -rf /opt/install_jdk8;
50 rm -rf /opt/networking-onos; 65 rm -rf /opt/networking-onos;
51 rm -rf /root/.m2/*.tar" 66 rm -rf /root/.m2/*.tar"
67=======
68 tar xf /root/.m2/repository.tar -C /root/.m2/",
69>>>>>>> 22530ae... fuel plugin onos for 6.1
52} 70}
53} 71}
diff --git a/deployment_scripts/puppet/modules/onos/manifests/service.pp b/deployment_scripts/puppet/modules/onos/manifests/service.pp
index cffbef6..0777ceb 100644
--- a/deployment_scripts/puppet/modules/onos/manifests/service.pp
+++ b/deployment_scripts/puppet/modules/onos/manifests/service.pp
@@ -31,10 +31,24 @@ exec{ 'restart onos':
31exec{ 'sleep 100 again to stablize onos': 31exec{ 'sleep 100 again to stablize onos':
32 command => 'sleep 100;' 32 command => 'sleep 100;'
33}-> 33}->
34<<<<<<< HEAD
35=======
36exec{ 'restart onos again':
37 command => 'service onos restart',
38}->
39
40exec{ 'sleep 60 to stablize onos':
41 command => 'sleep 60;'
42}
43>>>>>>> 22530ae... fuel plugin onos for 6.1
34exec{ 'add onos auto start': 44exec{ 'add onos auto start':
35 command => 'echo "onos">>/opt/service', 45 command => 'echo "onos">>/opt/service',
36}-> 46}->
37exec{ 'stop haproxy': 47exec{ 'stop haproxy':
38 command => 'service haproxy stop', 48 command => 'service haproxy stop',
39} 49}
40} \ No newline at end of file 50<<<<<<< HEAD
51}
52=======
53}
54>>>>>>> 22530ae... fuel plugin onos for 6.1
diff --git a/metadata.yaml b/metadata.yaml
index 599ec57..252b3c4 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -3,7 +3,11 @@ name: onos
3# Human-readable name for your plugin 3# Human-readable name for your plugin
4title: onos plugin 4title: onos plugin
5# Plugin version 5# Plugin version
6<<<<<<< HEAD
6version: '0.1.1' 7version: '0.1.1'
8=======
9version: '0.6.1'
10>>>>>>> 22530ae... fuel plugin onos for 6.1
7# Description 11# Description
8description: Enable to use plugin onos for Neutron 12description: Enable to use plugin onos for Neutron
9# Required fuel version 13# Required fuel version
@@ -13,7 +17,11 @@ licenses: ['Apache License Version 2.0']
13# Specify author or company name 17# Specify author or company name
14authors: ['Wenbin Wu, Huawei'] 18authors: ['Wenbin Wu, Huawei']
15# A link to the plugin's page 19# A link to the plugin's page
20<<<<<<< HEAD
16homepage: 'https://github.com/stackforge/fuel-plugins' 21homepage: 'https://github.com/stackforge/fuel-plugins'
22=======
23homepage: 'https://github.com/openstack/fuel-plugin-onos'
24>>>>>>> 22530ae... fuel plugin onos for 6.1
17# Specify a group which your plugin implements, possible options: 25# Specify a group which your plugin implements, possible options:
18# network, storage, storage::cinder, storage::glance, hypervisor 26# network, storage, storage::cinder, storage::glance, hypervisor
19groups: ['network'] 27groups: ['network']
diff --git a/pre_build_hook b/pre_build_hook
index b7b20b5..f2f8135 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -3,7 +3,11 @@ set -eux
3DIR="$(dirname `readlink -f $0`)" 3DIR="$(dirname `readlink -f $0`)"
4TARGET="${DIR}/deployment_scripts/puppet/modules/onos/files" 4TARGET="${DIR}/deployment_scripts/puppet/modules/onos/files"
5packages=packages.tar.gz 5packages=packages.tar.gz
6<<<<<<< HEAD
6packages_url=-http://58.251.166.184:9999/OPNFV/Compass4nfv/cache/packages.tar.gz 7packages_url=-http://58.251.166.184:9999/OPNFV/Compass4nfv/cache/packages.tar.gz
8=======
9packages_url=http://205.177.226.235:9999/OPNFV/Compass4nfv/cache/packages.tar.gz
10>>>>>>> 22530ae... fuel plugin onos for 6.1
7cd $TARGET 11cd $TARGET
8if [ ! -f "$packages" ]; then 12if [ ! -f "$packages" ]; then
9 wget --no-cookies $packages_url -P $TARGET 13 wget --no-cookies $packages_url -P $TARGET
diff --git a/repositories/centos/repodata/2daa2f7a904d6ae04d81abc07d2ecb3bc3d8244a1e78afced2c94994f1b5f3ee-filelists.sqlite.bz2 b/repositories/centos/repodata/2daa2f7a904d6ae04d81abc07d2ecb3bc3d8244a1e78afced2c94994f1b5f3ee-filelists.sqlite.bz2
new file mode 100644
index 0000000..8a57fe2
--- /dev/null
+++ b/repositories/centos/repodata/2daa2f7a904d6ae04d81abc07d2ecb3bc3d8244a1e78afced2c94994f1b5f3ee-filelists.sqlite.bz2
Binary files differ
diff --git a/repositories/centos/repodata/401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93-filelists.xml.gz b/repositories/centos/repodata/401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93-filelists.xml.gz
new file mode 100644
index 0000000..995719d
--- /dev/null
+++ b/repositories/centos/repodata/401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93-filelists.xml.gz
Binary files differ
diff --git a/repositories/centos/repodata/6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670-other.xml.gz b/repositories/centos/repodata/6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670-other.xml.gz
new file mode 100644
index 0000000..d44692a
--- /dev/null
+++ b/repositories/centos/repodata/6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670-other.xml.gz
Binary files differ
diff --git a/repositories/centos/repodata/ad36b2b9cd3689c29dcf84226b0b4db80633c57d91f50997558ce7121056e331-primary.sqlite.bz2 b/repositories/centos/repodata/ad36b2b9cd3689c29dcf84226b0b4db80633c57d91f50997558ce7121056e331-primary.sqlite.bz2
new file mode 100644
index 0000000..c18b20d
--- /dev/null
+++ b/repositories/centos/repodata/ad36b2b9cd3689c29dcf84226b0b4db80633c57d91f50997558ce7121056e331-primary.sqlite.bz2
Binary files differ
diff --git a/repositories/centos/repodata/d5630fb9d7f956c42ff3962f2e6e64824e5df7edff9e08adf423d4c353505d69-other.sqlite.bz2 b/repositories/centos/repodata/d5630fb9d7f956c42ff3962f2e6e64824e5df7edff9e08adf423d4c353505d69-other.sqlite.bz2
new file mode 100644
index 0000000..ec5369a
--- /dev/null
+++ b/repositories/centos/repodata/d5630fb9d7f956c42ff3962f2e6e64824e5df7edff9e08adf423d4c353505d69-other.sqlite.bz2
Binary files differ
diff --git a/repositories/centos/repodata/dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9-primary.xml.gz b/repositories/centos/repodata/dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9-primary.xml.gz
new file mode 100644
index 0000000..2e5f2cf
--- /dev/null
+++ b/repositories/centos/repodata/dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9-primary.xml.gz
Binary files differ
diff --git a/repositories/centos/repodata/repomd.xml b/repositories/centos/repodata/repomd.xml
new file mode 100644
index 0000000..039f37a
--- /dev/null
+++ b/repositories/centos/repodata/repomd.xml
@@ -0,0 +1,55 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
3 <revision>1448613543</revision>
4<data type="filelists">
5 <checksum type="sha256">401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93</checksum>
6 <open-checksum type="sha256">bf9808b81cb2dbc54b4b8e35adc584ddcaa73bd81f7088d73bf7dbbada961310</open-checksum>
7 <location href="repodata/401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93-filelists.xml.gz"/>
8 <timestamp>1448613543</timestamp>
9 <size>123</size>
10 <open-size>125</open-size>
11</data>
12<data type="primary">
13 <checksum type="sha256">dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9</checksum>
14 <open-checksum type="sha256">e1e2ffd2fb1ee76f87b70750d00ca5677a252b397ab6c2389137a0c33e7b359f</open-checksum>
15 <location href="repodata/dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9-primary.xml.gz"/>
16 <timestamp>1448613543</timestamp>
17 <size>134</size>
18 <open-size>167</open-size>
19</data>
20<data type="primary_db">
21 <checksum type="sha256">ad36b2b9cd3689c29dcf84226b0b4db80633c57d91f50997558ce7121056e331</checksum>
22 <open-checksum type="sha256">960e2acb75b3414dd377efbe0277342d8a911139e8100357c83177a9351ddd6f</open-checksum>
23 <location href="repodata/ad36b2b9cd3689c29dcf84226b0b4db80633c57d91f50997558ce7121056e331-primary.sqlite.bz2"/>
24 <timestamp>1448613543</timestamp>
25 <database_version>10</database_version>
26 <size>1130</size>
27 <open-size>21504</open-size>
28</data>
29<data type="other_db">
30 <checksum type="sha256">d5630fb9d7f956c42ff3962f2e6e64824e5df7edff9e08adf423d4c353505d69</checksum>
31 <open-checksum type="sha256">257af9e36ea0f10e4fc9e6053bf7f4cd9f0919b8857e93ec36b11b4ae8103440</open-checksum>
32 <location href="repodata/d5630fb9d7f956c42ff3962f2e6e64824e5df7edff9e08adf423d4c353505d69-other.sqlite.bz2"/>
33 <timestamp>1448613543</timestamp>
34 <database_version>10</database_version>
35 <size>570</size>
36 <open-size>6144</open-size>
37</data>
38<data type="other">
39 <checksum type="sha256">6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670</checksum>
40 <open-checksum type="sha256">e0ed5e0054194df036cf09c1a911e15bf2a4e7f26f2a788b6f47d53e80717ccc</open-checksum>
41 <location href="repodata/6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670-other.xml.gz"/>
42 <timestamp>1448613543</timestamp>
43 <size>123</size>
44 <open-size>121</open-size>
45</data>
46<data type="filelists_db">
47 <checksum type="sha256">2daa2f7a904d6ae04d81abc07d2ecb3bc3d8244a1e78afced2c94994f1b5f3ee</checksum>
48 <open-checksum type="sha256">de1e4e1a56e70198865fdff487472070da92d535f5419bd25ff700caf5ceeb92</open-checksum>
49 <location href="repodata/2daa2f7a904d6ae04d81abc07d2ecb3bc3d8244a1e78afced2c94994f1b5f3ee-filelists.sqlite.bz2"/>
50 <timestamp>1448613543</timestamp>
51 <database_version>10</database_version>
52 <size>591</size>
53 <open-size>7168</open-size>
54</data>
55</repomd>
diff --git a/repositories/ubuntu/Packages.gz b/repositories/ubuntu/Packages.gz
new file mode 100644
index 0000000..df37f65
--- /dev/null
+++ b/repositories/ubuntu/Packages.gz
Binary files differ
diff --git a/repositories/ubuntu/Release b/repositories/ubuntu/Release
new file mode 100644
index 0000000..2b56da4
--- /dev/null
+++ b/repositories/ubuntu/Release
@@ -0,0 +1,2 @@
1Label: onos
2Version: 0.1