Browse Source

Update plugin for Fuel 7.0 release

Change-Id: Ib8669feef81f2d8b7cecd8b59be73af9cf11381b
Emma Gordon 3 years ago
parent
commit
5caa12ae1a

+ 16
- 17
README.md View File

@@ -1,3 +1,10 @@
1
+WARNING - UNDER DEVLOPMENT:
2
+===========================
3
+This is the development branch for the Calico plugin for the Fuel 7.0 release. 
4
+For a stable, working Calico plugin that has been certified by Mirantis to work 
5
+with the Fuel 6.1 release, you should see the 6.1 branch of this repository.
6
+
7
+
1 8
 Calico plugin for Mirantis Fuel
2 9
 ===============================
3 10
 
@@ -14,22 +21,15 @@ of your way!
14 21
 Limitations:
15 22
 ------------
16 23
 
17
-In the current release, Calico requires a deployment with a single OpenStack
18
-controller. This limitation will be lifted in future releases.
24
+None.
19 25
 
20 26
 Compatible versions:
21 27
 --------------------
22 28
 
23
-	Mirantis Fuel 6.1
24
-
25
-To obtain the plugin:
26
----------------------
29
+	Mirantis Fuel 7.0
27 30
 
28
-The Calico plugin can be downloaded from the [Fuel Plugin Catalog](
29
-https://www.mirantis.com/products/openstack-drivers-and-plugins/fuel-plugins/).
30
-
31
-Alternatively, to build the plugin:
32
------------------------------------
31
+To build the plugin:
32
+--------------------
33 33
 
34 34
 - Install the fuel plugin builder, fpb:
35 35
 
@@ -45,7 +45,7 @@ Alternatively, to build the plugin:
45 45
 
46 46
 		fpb --build .
47 47
 
48
-- Check that the file calico-fuel-plugin-1.0-1.0.0-0.noarch.rpm was created.
48
+- Check that the file calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm was created.
49 49
 
50 50
 
51 51
 To install the plugin:
@@ -55,13 +55,13 @@ To install the plugin:
55 55
 
56 56
 - Copy the plugin onto the fuel master node:
57 57
 
58
-		scp calico-fuel-plugin-1.0-1.0.0-0.noarch.rpm root@<Fuel_Master_Node_IP>:/tmp
58
+		scp calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm root@<Fuel_Master_Node_IP>:/tmp
59 59
 
60 60
 - Install the plugin on the fuel master node:
61 61
 
62 62
 		cd /tmp
63 63
 
64
-		fuel plugins --install calico-fuel-plugin-1.0-1.0.0-0.noarch.rpm
64
+		fuel plugins --install calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm
65 65
 
66 66
 - Check the plugin was installed:
67 67
 
@@ -76,7 +76,7 @@ OpenStack cluster in the usual way, with the following guidelines:
76 76
 
77 77
 - Create a new OpenStack environment, selecting:
78 78
 
79
-	Juno on Ubuntu Trusty
79
+	Kilo on Ubuntu Trusty
80 80
 
81 81
 	"Neutron with VLAN segmentation" as the networking setup
82 82
 
@@ -97,7 +97,6 @@ OpenStack cluster in the usual way, with the following guidelines:
97 97
 	- Floating IP range: 172.18.203.70 - 172.18.203.79
98 98
 
99 99
 - Add nodes (for meaningful testing, you will need at least two compute nodes
100
-  in addition to the controller). Note that, in this release of Calico, only
101
-  a single controller node is supported.
100
+  in addition to the controller).
102 101
 
103 102
 - Deploy changes

+ 9
- 7
deployment_scripts/calico_compute.sh View File

@@ -1,6 +1,8 @@
1 1
 #!/bin/bash
2 2
 # Copyright 2015 Metaswitch Networks
3 3
 
4
+export DEBIAN_FRONTEND=noninteractive
5
+
4 6
 exec > /tmp/calico_compute.log 2>&1
5 7
 
6 8
 set -x
@@ -19,28 +21,28 @@ curl -L http://binaries.projectcalico.org/repo/key | apt-key add -
19 21
 # in the file names causes problems as it contains full stops, and the file
20 22
 # contents aren't what we want).
21 23
 
22
-rm -f /etc/apt/preferences.d/calico-fuel-plugin-1.0.0 /etc/apt/sources.list.d/calico-fuel-plugin-1.0.0.list
24
+rm -f /etc/apt/preferences.d/calico-fuel-plugin-2.0.0 /etc/apt/sources.list.d/calico-fuel-plugin-2.0.0.list
23 25
 
24 26
 cat > /etc/apt/sources.list.d/calico.list <<EOF
25
-deb http://binaries.projectcalico.org/fuel6.1 ./
27
+deb http://binaries.projectcalico.org/fuel7.0 ./
26 28
 EOF
27 29
 
28 30
 cat << PREFS >> /etc/apt/preferences.d/calico-fuel
29 31
 Package: *
30 32
 Pin: origin binaries.projectcalico.org
31
-Pin-Priority: 1100
33
+Pin-Priority: 1200
32 34
 PREFS
33 35
 
34 36
 # Add PPA for the etcd packages, and ensure that it has lower priority than
35 37
 # binaries.projectcalico.org so that we get the fuel versions of the calico
36 38
 # packages.
37 39
 
38
-apt-add-repository -y ppa:project-calico/juno
40
+apt-add-repository -y ppa:project-calico/kilo
39 41
 
40 42
 cat > /etc/apt/preferences.d/calico-etcd <<EOF
41 43
 Package: *
42
-Pin: origin ppa:project-calico/juno
43
-Pin-Priority: 1075
44
+Pin: release o=LP-PPA-project-calico-kilo
45
+Pin-Priority: 1175
44 46
 EOF
45 47
 
46 48
 # Pick up package details from new sources.
@@ -78,7 +80,7 @@ service nova-compute restart
78 80
 
79 81
 # Install some extra packages.
80 82
 
81
-apt-get -y install neutron-common neutron-dhcp-agent nova-api-metadata
83
+apt-get -y install neutron-common neutron-dhcp-agent nova-api
82 84
 
83 85
 # Open /etc/neutron/dhcp_agent.ini in your preferred text editor. In
84 86
 # the [DEFAULT] section, add the following line:

+ 8
- 6
deployment_scripts/calico_controller.sh View File

@@ -1,6 +1,8 @@
1 1
 #!/bin/bash
2 2
 # Copyright 2015 Metaswitch Networks
3 3
 
4
+export DEBIAN_FRONTEND=noninteractive
5
+
4 6
 exec > /tmp/calico_controller.log 2>&1
5 7
 
6 8
 set -x
@@ -18,28 +20,28 @@ curl -L http://binaries.projectcalico.org/repo/key | apt-key add -
18 20
 # in the file names causes problems as it contains full stops, and the file
19 21
 # contents aren't what we want).
20 22
 
21
-rm -f /etc/apt/preferences.d/calico-fuel-plugin-1.0.0 /etc/apt/sources.list.d/calico-fuel-plugin-1.0.0.list
23
+rm -f /etc/apt/preferences.d/calico-fuel-plugin-2.0.0 /etc/apt/sources.list.d/calico-fuel-plugin-2.0.0.list
22 24
 
23 25
 cat > /etc/apt/sources.list.d/calico.list <<EOF
24
-deb http://binaries.projectcalico.org/fuel6.1 ./
26
+deb http://binaries.projectcalico.org/fuel7.0 ./
25 27
 EOF
26 28
 
27 29
 cat << PREFS >> /etc/apt/preferences.d/calico-fuel
28 30
 Package: *
29 31
 Pin: origin binaries.projectcalico.org
30
-Pin-Priority: 1100
32
+Pin-Priority: 1200
31 33
 PREFS
32 34
 
33 35
 # Add PPA for the etcd packages, and ensure that it has lower priority than
34 36
 # binaries.projectcalico.org so that we get the fuel versions of the calico
35 37
 # packages.
36 38
 
37
-apt-add-repository -y ppa:project-calico/juno
39
+apt-add-repository -y ppa:project-calico/kilo
38 40
 
39 41
 cat > /etc/apt/preferences.d/calico-etcd <<EOF
40 42
 Package: *
41
-Pin: origin ppa:project-calico/juno
42
-Pin-Priority: 1075
43
+Pin: release o=LP-PPA-project-calico-kilo
44
+Pin-Priority: 1175
43 45
 EOF
44 46
 
45 47
 # Pick up package details from new sources.

+ 0
- 0
doc/.gitkeep View File


BIN
doc/TestPlanforCalicoFuelPlugin.pdf View File


BIN
doc/TestReportforCalicoFuelPlugin.docx.pdf View File


BIN
doc/calico-fuel-plugin-1.0.0.pdf View File


+ 3
- 3
metadata.yaml View File

@@ -3,11 +3,11 @@ name: calico-fuel-plugin
3 3
 # Human-readable name for your plugin
4 4
 title: Use Calico Virtual Networking
5 5
 # Plugin version
6
-version: 1.0.0
6
+version: 2.0.0
7 7
 # Description
8 8
 description: Layer 3 Virtual Networking for Highly Scalable Data Centers
9 9
 # Required fuel version
10
-fuel_version: ['6.1']
10
+fuel_version: ['7.0']
11 11
 # Plugin authors
12 12
 authors: ['Emma Gordon']
13 13
 # Plugin license
@@ -20,7 +20,7 @@ groups: ['network']
20 20
 # The plugin is compatible with releases in the list
21 21
 releases:
22 22
   - os: ubuntu
23
-    version: 2014.2-6.1
23
+    version: 2015.1-7.0
24 24
     mode: ['ha', 'multinode']
25 25
     deployment_scripts_path: deployment_scripts/
26 26
     repository_path: repositories/ubuntu

+ 10
- 8
specs/calico-fuel-plugin.rst View File

@@ -6,7 +6,7 @@ Fuel Plugin for Project Calico
6 6
 The Calico plugin provides the ability to use Calico as a networking backend
7 7
 for Mirantis OpenStack.
8 8
 
9
-Compatible with Fuel version 6.1.
9
+Compatible with Fuel version 7.0.
10 10
 
11 11
 Problem description
12 12
 ===================
@@ -22,13 +22,15 @@ and destination workloads.
22 22
 Proposed change
23 23
 ===============
24 24
 
25
-Implement a Fuel plugin that will install and configure Calico networking in a
26
-Mirantis OpenStack deployment.
25
+Update the Calico plugin for Fuel version 6.1 to support version 7.0. This will 
26
+involve moving from the Juno to the Kilo release of Mirantis OpenStack.
27
+
28
+Support for HA deployments with multiple controllers will also be added.
27 29
 
28 30
 Alternatives
29 31
 ------------
30 32
 
31
-N/A - the aim is to implement a Fuel plugin.
33
+N/A
32 34
 
33 35
 Data model impact
34 36
 -----------------
@@ -43,7 +45,7 @@ None.
43 45
 Upgrade impact
44 46
 --------------
45 47
 
46
-When upgrading the Fuel Master node to Fuel Version higher than 6.1, plugin 
48
+When upgrading the Fuel Master node to Fuel Version higher than 7.0, plugin 
47 49
 compatibility should be checked, and a new plugin installed if necessary.
48 50
 
49 51
 Security impact
@@ -102,9 +104,9 @@ Other contributors:
102 104
 Work Items
103 105
 ----------
104 106
 
105
-* Integrate Calico with Fuel 6.1.
107
+* Integrate Calico with Fuel 7.0.
106 108
 
107
-* Implement the Calico plugin.
109
+* Update the Calico plugin.
108 110
 
109 111
 * Test Calico plugin.
110 112
 
@@ -113,7 +115,7 @@ Work Items
113 115
 Dependencies
114 116
 ============
115 117
 
116
-* Fuel 6.1.
118
+* Fuel 7.0.
117 119
 
118 120
 Testing
119 121
 =======

Loading…
Cancel
Save