Update plugin for Fuel 7.0 release

Change-Id: Ib8669feef81f2d8b7cecd8b59be73af9cf11381b

README.md

@@ -1,3 +1,10 @@
+WARNING - UNDER DEVLOPMENT:
+===========================
+This is the development branch for the Calico plugin for the Fuel 7.0 release. 
+For a stable, working Calico plugin that has been certified by Mirantis to work 
+with the Fuel 6.1 release, you should see the 6.1 branch of this repository.
+
+
 Calico plugin for Mirantis Fuel
 ===============================
 
@@ -14,22 +21,15 @@ of your way!
 Limitations:
 ------------
 
-In the current release, Calico requires a deployment with a single OpenStack
+None.
-controller. This limitation will be lifted in future releases.
 
 Compatible versions:
 --------------------
 
-	Mirantis Fuel 6.1
+	Mirantis Fuel 7.0
 
-To obtain the plugin:
+To build the plugin:
----------------------
+--------------------
-
-The Calico plugin can be downloaded from the [Fuel Plugin Catalog](
-https://www.mirantis.com/products/openstack-drivers-and-plugins/fuel-plugins/).
-
-Alternatively, to build the plugin:
------------------------------------
 
 - Install the fuel plugin builder, fpb:
 
@@ -45,7 +45,7 @@ Alternatively, to build the plugin:
 
 		fpb --build .
 
-- Check that the file calico-fuel-plugin-1.0-1.0.0-0.noarch.rpm was created.
+- Check that the file calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm was created.
 
 
 To install the plugin:
@@ -55,13 +55,13 @@ To install the plugin:
 
 - Copy the plugin onto the fuel master node:
 
-		scp calico-fuel-plugin-1.0-1.0.0-0.noarch.rpm root@<Fuel_Master_Node_IP>:/tmp
+		scp calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm root@<Fuel_Master_Node_IP>:/tmp
 
 - Install the plugin on the fuel master node:
 
 		cd /tmp
 
-		fuel plugins --install calico-fuel-plugin-1.0-1.0.0-0.noarch.rpm
+		fuel plugins --install calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm
 
 - Check the plugin was installed:
 
@@ -76,7 +76,7 @@ OpenStack cluster in the usual way, with the following guidelines:
 
 - Create a new OpenStack environment, selecting:
 
-	Juno on Ubuntu Trusty
+	Kilo on Ubuntu Trusty
 
 	"Neutron with VLAN segmentation" as the networking setup
 
@@ -97,7 +97,6 @@ OpenStack cluster in the usual way, with the following guidelines:
 	- Floating IP range: 172.18.203.70 - 172.18.203.79
 
 - Add nodes (for meaningful testing, you will need at least two compute nodes
-  in addition to the controller). Note that, in this release of Calico, only
+  in addition to the controller).
-  a single controller node is supported.
 
 - Deploy changes

deployment_scripts/calico_compute.sh

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

deployment_scripts/calico_controller.sh

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

metadata.yaml

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

specs/calico-fuel-plugin.rst

@@ -6,7 +6,7 @@ Fuel Plugin for Project Calico
 The Calico plugin provides the ability to use Calico as a networking backend
 for Mirantis OpenStack.
 
-Compatible with Fuel version 6.1.
+Compatible with Fuel version 7.0.
 
 Problem description
 ===================
@@ -22,13 +22,15 @@ and destination workloads.
 Proposed change
 ===============
 
-Implement a Fuel plugin that will install and configure Calico networking in a
+Update the Calico plugin for Fuel version 6.1 to support version 7.0. This will 
-Mirantis OpenStack deployment.
+involve moving from the Juno to the Kilo release of Mirantis OpenStack.
+
+Support for HA deployments with multiple controllers will also be added.
 
 Alternatives
 ------------
 
-N/A - the aim is to implement a Fuel plugin.
+N/A
 
 Data model impact
 -----------------
@@ -43,7 +45,7 @@ None.
 Upgrade impact
 --------------
 
-When upgrading the Fuel Master node to Fuel Version higher than 6.1, plugin 
+When upgrading the Fuel Master node to Fuel Version higher than 7.0, plugin 
 compatibility should be checked, and a new plugin installed if necessary.
 
 Security impact
@@ -102,9 +104,9 @@ Other contributors:
 Work Items
 ----------
 
-* Integrate Calico with Fuel 6.1.
+* Integrate Calico with Fuel 7.0.
 
-* Implement the Calico plugin.
+* Update the Calico plugin.
 
 * Test Calico plugin.
 
@@ -113,7 +115,7 @@ Work Items
 Dependencies
 ============
 
-* Fuel 6.1.
+* Fuel 7.0.
 
 Testing
 =======