Version after last changes should be incremented to 2.0.1

So do that here, and also correct incorrect "-1"s for the RPM build
version.

Change-Id: Ibfcfd905bfc44cfe95476eae50ce527bfec374cd

README.md

@@ -50,7 +50,7 @@ To build the plugin:
 
 		fpb --build .
 
-- Check that the file calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm was created.
+- Check that the file calico-fuel-plugin-2.0-2.0.1-1.noarch.rpm was created.
 
 
 To install the plugin:
@@ -60,13 +60,13 @@ To install the plugin:
 
 - Copy the plugin onto the fuel master node:
 
-		scp calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm root@<Fuel_Master_Node_IP>:/tmp
+		scp calico-fuel-plugin-2.0-2.0.1-1.noarch.rpm root@<Fuel_Master_Node_IP>:/tmp
 
 - Install the plugin on the fuel master node:
 
 		cd /tmp
 
-		fuel plugins --install calico-fuel-plugin-2.0-2.0.0-0.noarch.rpm
+		fuel plugins --install calico-fuel-plugin-2.0-2.0.1-1.noarch.rpm
 
 - Check the plugin was installed:
 
@@ -91,14 +91,14 @@ OpenStack cluster in the usual way, with the following guidelines:
 
 	"Use Calico Virtual Networking"
 
-- Under the network tab, configure the 'Public' settings (leaving all of the 
+- Under the network tab, configure the 'Public' settings (leaving all of the
   other sections with their default values). For example (exact values will
   depend on your setup):
 
 	- IP Range: 172.18.203.60 - 172.18.203.69
         - CIDR: 172.18.203.0/24
         - Use VLAN tagging: No
-        - Gateway: 172.18.203.1 
+        - Gateway: 172.18.203.1
 	- Floating IP range: 172.18.203.70 - 172.18.203.79
 
 - Add nodes (for meaningful testing, you will need at least two compute nodes

deployment_scripts/calico_compute.sh

@@ -21,7 +21,7 @@ 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-2.0.0 /etc/apt/sources.list.d/calico-fuel-plugin-2.0.0.list
+rm -f /etc/apt/preferences.d/calico-fuel-plugin-2.0 /etc/apt/sources.list.d/calico-fuel-plugin-2.0.list
 
 cat > /etc/apt/sources.list.d/calico.list <<EOF
 deb http://binaries.projectcalico.org/fuel7.0 ./

deployment_scripts/calico_controller.sh

@@ -21,7 +21,7 @@ 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-2.0.0 /etc/apt/sources.list.d/calico-fuel-plugin-2.0.0.list
+rm -f /etc/apt/preferences.d/calico-fuel-plugin-2.0 /etc/apt/sources.list.d/calico-fuel-plugin-2.0.list
 
 cat > /etc/apt/sources.list.d/calico.list <<EOF
 deb http://binaries.projectcalico.org/fuel7.0 ./

metadata.yaml

@@ -3,7 +3,7 @@ name: calico-fuel-plugin
 # Human-readable name for your plugin
 title: Use Calico Virtual Networking
 # Plugin version
-version: 2.0.0
+version: 2.0.1
 # Description
 description: Layer 3 Virtual Networking for Highly Scalable Data Centers
 # Required fuel version