Merge "Remove unused imports"

diff --git a/.gitmodules b/.gitmodules
index 290b742..4d35439 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -51,7 +51,7 @@
 [submodule "network-checker"]
        path = build/f_repos/sub/network-checker
        url = https://github.com/openstack/network-checker.git
-       branch = master
+       branch = stable/newton
         ignore = all
 [submodule "fuel-ui"]
        path = build/f_repos/sub/fuel-ui

diff --git a/build/Makefile b/build/Makefile
index e836de1..c8fc793 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -57,14 +57,11 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" |
 
 export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py)
 
-# Short circuiting normal package selection as this seems currently broken, see
-# hard coding in config.mk
-# export MIRROR_MOS_UBUNTU ?= $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3)
-# export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1)
-# export LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
-# export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
-# export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
-# export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
+export MIRROR_MOS_UBUNTU ?= $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3)
+export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1)
+export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
+export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
+export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
 
 # uncomment and use: make print-VARIABLE
 #print-%  : ; @echo $* = $($*)

diff --git a/build/config.mk b/build/config.mk
index 6297a27..56317cb 100644 (file)
--- a/build/config.mk
+++ b/build/config.mk
@@ -33,23 +33,6 @@ F_OPNFV_TAG  := ${FUEL_MAIN_TAG}-opnfv
 FUEL_MAIN_REPO := ${F_SUBMOD_DIR}/fuel-main
 
 
-
-# Settings for Fuel 10 BEGIN
-#
-# Currently it seems impossible to build Fuel 10 from upstream without
-# hard coding specific repositories. The Fuel Ubuntu mirror seems to not
-# have been fully populated.
-
-export MIRROR_UBUNTU?=cz.archive.ubuntu.com
-export MIRROR_UBUNTU_ROOT?=/ubuntu/
-export MIRROR_MOS_UBUNTU?=mirror.seed-cz1.fuel-infra.org
-export MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/xenial//snapshots/master-2016-10-10-100022
-export MIRROR_CENTOS?=http://mirror.seed-cz1.fuel-infra.org/pkgs/snapshots/centos-7.2.1511-2016-08-07-170016
-export MIRROR_FUEL?=http://mirror.seed-cz1.fuel-infra.org//mos-repos/centos/mos-master-centos7//snapshots/os-2016-10-18-120021/x86_64
-export MIRROR_MOS_UBUNTU_SUITE?=mos-master
-
-# Settings for Fuel 10 END
-
 export FUELLIB_REPO?=${F_SUBMOD_DIR}/fuel-library
 export NAILGUN_REPO?=${F_SUBMOD_DIR}/fuel-web
 export PYTHON_FUELCLIENT_REPO?=${F_SUBMOD_DIR}/python-fuelclient

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 13f69b9..e189e16 100644 (file)
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,7 +11,7 @@
 # Add Fuel plugin build targets here
 # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have
 # verified it!
-PLUGINS = f_ovs-nsh-dpdk-pluginbuild
+PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild
 export PLUGINS
 NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild
 

diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index eaef3d4..fa284b3 100644 (file)
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-KVMFORNFV_BRANCH=stable/colorado
+KVMFORNFV_BRANCH=master
 KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
-KVMFORNFV_CHANGE=e6588d1d59d7ac24f25f644650e6845561dd441b
+KVMFORNFV_CHANGE=ec568fdb37d280371733cab5e9fad030557f6921

diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
index 35f4059..82f0723 100644 (file)
--- a/build/f_isoroot/f_vsperfpluginbuild/config.mk
+++ b/build/f_isoroot/f_vsperfpluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-VSPERF_BRANCH?=5a0c6772d255aeb0ab1e6246c91bbeb56bb3a239
+VSPERF_BRANCH?=efdc282f4b08e96f3e09d43f94ba0508e4f26090
 VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git
 VSPERF_CHANGE?=

diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile
index f09dbed..be6f829 100644 (file)
--- a/build/f_repos/Makefile
+++ b/build/f_repos/Makefile
@@ -34,10 +34,7 @@ include ../config.mk
 
 # To enable remote tracking, set the following var to any non-empty string.
 # Leaving this var empty will bind each git submodule to its saved commit.
-# NOTE: For non-stable branches, unless overriden, always track remotes
-# Need to disable this logic temporarily as Newton doesn't seem to have stable
-# branches in all repos. /Stefan
-# FUEL_TRACK_REMOTES ?= $(shell git symbolic-ref --short HEAD | grep -v stable)
+FUEL_TRACK_REMOTES ?= yes
 
 .PHONY: all
 all: release

diff --git a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
index 820e387..d01ce8b 100644 (file)
--- a/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
+++ b/build/f_repos/patch/fuel-main/0001-Patches-for-OPNFV.patch
@@ -41,7 +41,7 @@ index dbcac5f..1826390 100755
  # Enable sshd
 -systemctl enable sshd
 -systemctl start sshd
-+systemctl reload sshd
++systemctl restart sshd
  
  # Enable iptables
  systemctl enable iptables.service

diff --git a/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch b/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch
new file mode 100644 (file)
index 0000000..7345230
--- /dev/null
+++ b/build/f_repos/patch/fuel-main/0002-xorriso-fails-to-add-files-with-path-longer-then-240.patch
@@ -0,0 +1,24 @@
+From: Artem Silenkov <asilenkov@mirantis.com>
+Date: Tue, 22 Sep 2015 21:54:44 +0300
+Subject: [PATCH] xorriso fails to add files with path longer then 240
+
+joliet-long option added to xorriso command line
+
+Change-Id: I97016cf3e6a554f44d839740ba7d210337435cdc
+Related-Bug: #1498619
+---
+ iso/module.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/iso/module.mk b/iso/module.mk
+index 8995378..0073068 100644
+--- a/iso/module.mk
++++ b/iso/module.mk
+@@ -174,6 +174,7 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
+               -V $(ISO_VOLUME_ID) -p $(ISO_VOLUME_PREP) \
+               -J -R \
+               -graft-points \
++              -joliet-long \
+               -b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
+               -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
+               -eltorito-alt-boot -e images/efiboot.img -no-emul-boot \

diff --git a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
new file mode 100644 (file)
index 0000000..a31c52b
--- /dev/null
+++ b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch
@@ -0,0 +1,59 @@
+From: Stanislaw Kardach <stanislaw.kardach@cavium.com>
+Date: Thu, 25 Feb 2016 13:31:19 +0100
+Subject: [PATCH] repo mirror: Allow multi-arch local mirrors
+
+This patch allows specifying multiple architectures via UBUNTU_ARCH in
+form of a list of space separated architectures. The first architecture
+in the list is considered primary and will be used for building all the
+deb packages by fuel-main. Additional architectures are added to allow
+targets of other architectures to use the mirror.
+NOTE: this imposes a requirement that all packages built are arch
+independent (which is true so far).
+
+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ config.mk               | 2 +-
+ mirror/ubuntu/module.mk | 2 +-
+ sandbox.mk              | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config.mk b/config.mk
+index 7f7d965..83c3810 100644
+--- a/config.mk
++++ b/config.mk
+@@ -48,7 +48,7 @@ UBUNTU_MINOR?=04
+ UBUNTU_RELEASE_NUMBER:=$(UBUNTU_MAJOR).$(UBUNTU_MINOR)
+ UBUNTU_KERNEL_FLAVOR?=lts-xenial
+ UBUNTU_NETBOOT_FLAVOR?=netboot
+-UBUNTU_ARCH:=amd64
++UBUNTU_ARCH?=amd64
+ UBUNTU_IMAGE_RELEASE:=$(UBUNTU_MAJOR)$(UBUNTU_MINOR)
+ SEPARATE_IMAGES?=/boot,ext2 /,ext4
+
+diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk
+index 7a9466e..fe1ada2 100644
+--- a/mirror/ubuntu/module.mk
++++ b/mirror/ubuntu/module.mk
+@@ -81,7 +81,7 @@ $(BUILD_DIR)/mirror/ubuntu/mirror.done:
+       --root=$(MIRROR_MOS_UBUNTU_ROOT) \
+       --dist=$(MIRROR_MOS_UBUNTU_SUITE) \
+       --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \
+-      --arch=$(UBUNTU_ARCH) \
++      --arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \
+       $(LOCAL_MIRROR_UBUNTU)/
+       rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project
+       $(ACTION.TOUCH)
+diff --git a/sandbox.mk b/sandbox.mk
+index 9d34dc9..e787f43 100644
+--- a/sandbox.mk
++++ b/sandbox.mk
+@@ -199,7 +199,7 @@ touch $(SANDBOX_UBUNTU)/etc/init.d/.legacy-bootordering
+ mkdir -p $(SANDBOX_UBUNTU)/usr/sbin
+ cp -a $(BUILD_DIR)/policy-rc.d $(SANDBOX_UBUNTU)/usr/sbin
+ echo "Running debootstrap"
+-sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(UBUNTU_ARCH) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
++sudo debootstrap --no-check-gpg --include=ca-certificates --arch=$(word 1,$(UBUNTU_ARCH)) $(MIRROR_UBUNTU_SUITE) $(SANDBOX_UBUNTU) $(MIRROR_UBUNTU_METHOD)://$(MIRROR_UBUNTU)$(MIRROR_UBUNTU_ROOT)
+ if [ -e $(SANDBOX_UBUNTU)/etc/resolv.conf ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf.orig; fi
+ sudo cp /etc/resolv.conf $(SANDBOX_UBUNTU)/etc/resolv.conf
+ if [ -e $(SANDBOX_UBUNTU)/etc/hosts ]; then sudo cp -a $(SANDBOX_UBUNTU)/etc/hosts $(SANDBOX_UBUNTU)/etc/hosts.orig; fi

diff --git a/build/f_repos/sub/fuel-agent b/build/f_repos/sub/fuel-agent
index 075fc9e..7d35078 160000 (submodule)
--- a/build/f_repos/sub/fuel-agent
+++ b/build/f_repos/sub/fuel-agent
@@ -1 +1 @@
-Subproject commit 075fc9e2572330416ec0aad45bce969baa43b4f3
+Subproject commit 7d35078a9d67a9015f49f5813dbad225837095a4

diff --git a/build/f_repos/sub/fuel-astute b/build/f_repos/sub/fuel-astute
index bca595a..87ba44d 160000 (submodule)
--- a/build/f_repos/sub/fuel-astute
+++ b/build/f_repos/sub/fuel-astute
@@ -1 +1 @@
-Subproject commit bca595a964e4f45798f393bb0bbc685605cae090
+Subproject commit 87ba44dcde92a0bfe50fdba6e0a2f271e6859919

diff --git a/build/f_repos/sub/fuel-library b/build/f_repos/sub/fuel-library
index 2cd11d3..0281ca8 160000 (submodule)
--- a/build/f_repos/sub/fuel-library
+++ b/build/f_repos/sub/fuel-library
@@ -1 +1 @@
-Subproject commit 2cd11d3a506f9039b7bfd2f3b720df7f1244df9b
+Subproject commit 0281ca8ee1900271252edc5e6e1ceb2112cfd0da

diff --git a/build/f_repos/sub/fuel-main b/build/f_repos/sub/fuel-main
index 70749a2..a0f955f 160000 (submodule)
--- a/build/f_repos/sub/fuel-main
+++ b/build/f_repos/sub/fuel-main
@@ -1 +1 @@
-Subproject commit 70749a24518b98e1162d60abdcd2c25c9ffa92ee
+Subproject commit a0f955fc5bff09c02d538ae2c9a7373b6ee511ed

diff --git a/build/f_repos/sub/fuel-menu b/build/f_repos/sub/fuel-menu
index 1a94d65..9aedc10 160000 (submodule)
--- a/build/f_repos/sub/fuel-menu
+++ b/build/f_repos/sub/fuel-menu
@@ -1 +1 @@
-Subproject commit 1a94d657ecaca4a1b549141ee22e5bc7ca20822e
+Subproject commit 9aedc10ffea536d7d353cb5869c492a1729a98f2

diff --git a/build/f_repos/sub/fuel-nailgun-agent b/build/f_repos/sub/fuel-nailgun-agent
index af1e5da..0cfe06b 160000 (submodule)
--- a/build/f_repos/sub/fuel-nailgun-agent
+++ b/build/f_repos/sub/fuel-nailgun-agent
@@ -1 +1 @@
-Subproject commit af1e5da094c2975230da29f808b26645231841d4
+Subproject commit 0cfe06be939f92c3a8158a0e8a96a7ab8cf5403b

diff --git a/build/f_repos/sub/fuel-ostf b/build/f_repos/sub/fuel-ostf
index ddd6912..132f287 160000 (submodule)
--- a/build/f_repos/sub/fuel-ostf
+++ b/build/f_repos/sub/fuel-ostf
@@ -1 +1 @@
-Subproject commit ddd691205d7dccfc9a9b52cc2681cdb367c82d2a
+Subproject commit 132f287fb769276cde63ac283222d5447bc68308

diff --git a/build/f_repos/sub/fuel-ui b/build/f_repos/sub/fuel-ui
index 2a22c98..5b66f90 160000 (submodule)
--- a/build/f_repos/sub/fuel-ui
+++ b/build/f_repos/sub/fuel-ui
@@ -1 +1 @@
-Subproject commit 2a22c985eeeb3adf2a18f3f56abdcc841caab252
+Subproject commit 5b66f907e628ba16d03a3fd3f259099b727a5fa2

diff --git a/build/f_repos/sub/fuel-web b/build/f_repos/sub/fuel-web
index 118b923..d04c110 160000 (submodule)
--- a/build/f_repos/sub/fuel-web
+++ b/build/f_repos/sub/fuel-web
@@ -1 +1 @@
-Subproject commit 118b9231a48f9341d72990ab3cc65f375d2423c9
+Subproject commit d04c1108b2b19e5d681a07fd3492b93d133c4617

diff --git a/build/f_repos/sub/python-fuelclient b/build/f_repos/sub/python-fuelclient
index 8702619..8ac48ac 160000 (submodule)
--- a/build/f_repos/sub/python-fuelclient
+++ b/build/f_repos/sub/python-fuelclient
@@ -1 +1 @@
-Subproject commit 870261942796f367ec046341ba095f7ac518f40c
+Subproject commit 8ac48ac48facc47923ba00c09bf96080ca88d31c

diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml
index ee2cfa7..ce81994 100644 (file)
--- a/deploy/config/dea_base.yaml
+++ b/deploy/config/dea_base.yaml
@@ -261,7 +261,7 @@ settings:
         group: network
         label: Public Gateway is Available
         type: checkbox
-        value: true
+        value: false
         weight: 50
       task_deploy:
         type: hidden
@@ -554,6 +554,8 @@ settings:
 
           hwloc
 
+          i40e-dkms
+
           linux-firmware
 
           linux-headers-generic-lts-xenial

diff --git a/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml b/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml
new file mode 100644 (file)
index 0000000..7d4dd09
--- /dev/null
+++ b/deploy/config/plugins/fuel-nfvkvm_1.0.0.yaml
@@ -0,0 +1,34 @@
+##############################################################################
+# Copyright (c) 2016 Mirantis, Inc. and others.
+# mpolenchuk@mirantis.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+plugin-config-metadata:
+  title: NFV KVM fuel Plugin configuration template
+  version: 1.0.0
+  created: 05.12.2016
+  comment: None
+
+fuel-plugin-kvm:
+  metadata:
+    #chosen_id: Assigned during installation
+    class: plugin
+    default: false
+    enabled: true
+    label: fuel-plugin-kvm
+    toggleable: true
+    versions:
+    - metadata:
+        always_editable: false
+        #plugin_id: 1 Assigned during installation
+        plugin_version: 1.0.0
+      use_kvm:
+        label: 'EXPERIMENTAL: KVM enhancements for NFV'
+        type: checkbox
+        value: true
+        weight: 20
+    weight: 70

diff --git a/deploy/config/plugins/fuel-nshovs_1.0.0.yaml b/deploy/config/plugins/fuel-nshovs_1.0.0.yaml
new file mode 100644 (file)
index 0000000..3c87d8b
--- /dev/null
+++ b/deploy/config/plugins/fuel-nshovs_1.0.0.yaml
@@ -0,0 +1,37 @@
+##############################################################################
+# Copyright (c) 2016 Mirantis, Inc. and others.
+# mpolenchuk@mirantis.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+plugin-config-metadata:
+  title: NSHOVS fuel Plugin configuration template
+  version: 0.3
+  created: Dec 14 2016
+  comment: None
+
+fuel-plugin-ovs:
+  metadata:
+    #chosen_id: Choosen at install time
+    class: plugin
+    default: false
+    enabled: true
+    label: Openvswitch with NSH support
+    toggleable: true
+    versions:
+    - install_dpdk:
+        type: "checkbox"
+        weight: 20
+        value: false
+        label: "Install DPDK"
+      install_nsh:
+        type: "checkbox"
+        weight: 20
+        value: false
+        label: "Install NSH"
+      metadata:
+        plugin_version: 1.0.0
+    weight: 70

diff --git a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
index 1217f72..8ced66d 100644 (file)
--- a/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-kvm_heat_ceilometer_scenario.yaml
@@ -34,7 +34,7 @@ deployment-scenario-metadata:
 stack-extensions:
    - module: fuel-plugin-kvm
      module-config-name: fuel-nfvkvm
-     module-config-version: 0.9.0
+     module-config-version: 1.0.0
      module-config-override:
        # Module config overrides
 

diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 51deb4e..9c689c9 100644 (file)
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
 # deployment configuration meta-data
 deployment-scenario-metadata:
    title: NFV OVS HA deployment
-   version: 0.9.0
+   version: 1.0.0
    created: Jul 12 2016
-   comment: Rebased to Fuel9
+   comment: Rebased to Fuel10
 
 ##############################################################################
 # Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -32,16 +32,20 @@ deployment-scenario-metadata:
 # <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
 # It does so by copying the config file to the local plugin config directory
 stack-extensions:
-   - module: fuel-plugin-ovs
-     module-config-name: fuel-nshovs
-     module-config-version: 0.9.0
-     module-config-override:
-       metadata:
-         versions:
-           - install_dpdk:
-               value: true
-             metadata:
-               plugin_version: 0.9.0
+   #
+   # Disable this plugin since Fuel already has newer
+   # version of openvswitch out of the box
+   #
+   # - module: fuel-plugin-ovs
+   #   module-config-name: fuel-nshovs
+   #   module-config-version: 1.0.0
+   #   module-config-override:
+   #     metadata:
+   #       versions:
+   #         - install_dpdk:
+   #             value: true
+   #           metadata:
+   #             plugin_version: 1.0.0
 
 ##############################################################################
 # By editing the override-config sections below, you can override arbitrary

diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 7ab76cb..8160e18 100644 (file)
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
 # deployment configuration meta-data
 deployment-scenario-metadata:
    title: NFV OVS NO-HA deployment
-   version: 0.9.0
+   version: 1.0.0
    created: Jul 12 2016
-   comment: NFV OVS NO-HA Rebased for Fuel9
+   comment: NFV OVS NO-HA Rebased for Fuel10
 
 ##############################################################################
 # Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -32,16 +32,20 @@ deployment-scenario-metadata:
 # <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
 # It does so by copying the config file to the local plugin config directory
 stack-extensions:
-   - module: fuel-plugin-ovs
-     module-config-name: fuel-nshovs
-     module-config-version: 0.9.0
-     module-config-override:
-       metadata:
-         versions:
-           - install_dpdk:
-               value: true
-             metadata:
-               plugin_version: 0.9.0
+   #
+   # Disable this plugin since Fuel already has newer
+   # version of openvswitch out of the box
+   #
+   # - module: fuel-plugin-ovs
+   #   module-config-name: fuel-nshovs
+   #   module-config-version: 1.0.0
+   #   module-config-override:
+   #     metadata:
+   #       versions:
+   #         - install_dpdk:
+   #             value: true
+   #           metadata:
+   #             plugin_version: 1.0.0
 
 ##############################################################################
 # By editing the override-config sections below, you can override arbitrary

diff --git a/docs/buildprocedure/build.instruction.rst b/docs/buildprocedure/build.instruction.rst
index e49ad08..1ee53a1 100644 (file)
--- a/docs/buildprocedure/build.instruction.rst
+++ b/docs/buildprocedure/build.instruction.rst
@@ -125,7 +125,7 @@ Check out the Colorado release:
 .. code-block:: bash
 
     $ cd fuel
-    $ git checkout colorado.2.0
+    $ git checkout colorado.3.0
 
 Clone the OPNFV code Git repository without a SSH key
 -----------------------------------------------------
@@ -298,8 +298,8 @@ The artifacts produced are:
 References
 ==========
 
-1) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html
+1) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/3.0/docs/installationprocedure/index.html
 
-2) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html
+2) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/buildprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/3.0/docs/buildprocedure/index.html
 
-3) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html
+3) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/releasenotes/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/3.0/docs/releasenotes/index.html

diff --git a/docs/installationprocedure/installation.instruction.rst b/docs/installationprocedure/installation.instruction.rst
index 4419459..548dff8 100644 (file)
--- a/docs/installationprocedure/installation.instruction.rst
+++ b/docs/installationprocedure/installation.instruction.rst
@@ -60,7 +60,7 @@ baseline required to replicate the Colorado release:
 
 .. code-block:: bash
 
-    $ git checkout colorado.2.0
+    $ git checkout colorado.3.0
 
 Go to the fuel directory and build the .iso:
 
@@ -684,8 +684,8 @@ Fuel
 Fuel in OPNFV
 =============
 
-13) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html
+13) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/3.0/docs/installationprocedure/index.html
 
-14) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html
+14) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/buildprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/3.0/docs/buildprocedure/index.html
 
-15) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html
+15) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/releasenotes/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/3.0/docs/releasenotes/index.html

diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst
index 4d880dd..b7fcc3e 100644 (file)
--- a/docs/releasenotes/release-notes.rst
+++ b/docs/releasenotes/release-notes.rst
@@ -8,7 +8,7 @@
 Abstract
 ========
 
-This document compiles the release notes for the Colorado 2.0 release of
+This document compiles the release notes for the Colorado 3.0 release of
 OPNFV when using Fuel as a deployment tool.
 
 ===============
@@ -16,7 +16,7 @@ Important notes
 ===============
 
 These notes provides release information for the use of Fuel as deployment
-tool for the Colorado 2.0 release of OPNFV.
+tool for the Colorado 3.0 release of OPNFV.
 
 The goal of the Colorado release and this Fuel-based deployment process is
 to establish a lab ready platform accelerating further development
@@ -80,13 +80,13 @@ Release Data
 | **Project**                          | fuel                                 |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Repo/tag**                         | colorado.2.0                         |
+| **Repo/tag**                         | colorado.3.0                         |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | Colorado 2.0 follow-up release       |
+| **Release designation**              | Colorado 3.0 follow-up release       |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | November 10 2016                     |
+| **Release date**                     | December 05 2016                     |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Purpose of the delivery**          | Colorado alignment to Released       |
@@ -110,7 +110,7 @@ Version change
 
 Module version changes
 ----------------------
-This is the Colorado 2.0 follow-up release.
+This is the Colorado 3.0 follow-up release.
 It is based on following upstream versions:
 
 - Fuel 9.0 Base release
@@ -123,7 +123,7 @@ It is based on following upstream versions:
 
 Document changes
 ----------------
-This is the Colorado 2.0 follow-up release.
+This is the Colorado 3.0 follow-up release.
 It comes with the following documentation:
 
 - Installation instructions - *Reference 13* - **Changed**
@@ -146,7 +146,7 @@ Bug corrections
 
 **JIRA TICKETS:**
 
-`Colorado 2.0 bug fixes  <https://jira.opnfv.org/issues/?filter=11203>`_ 'https://jira.opnfv.org/issues/?filter=11203'
+`Colorado 3.0 bug fixes  <https://jira.opnfv.org/issues/?filter=11406>`_ 'https://jira.opnfv.org/issues/?filter=11406'
 
 (Also See respective Integrated feature project's bug tracking)
 
@@ -188,7 +188,7 @@ Known issues
 
 **JIRA TICKETS:**
 
-`Known issues <https://jira.opnfv.org/issues/?filter=11205>`_ 'https://jira.opnfv.org/issues/?filter=11205'
+`Known issues <https://jira.opnfv.org/issues/?filter=11407>`_ 'https://jira.opnfv.org/issues/?filter=11407'
 
 (Also See respective Integrated feature project's bug tracking)
 
@@ -197,20 +197,20 @@ Workarounds
 
 **JIRA TICKETS:**
 
-`Workarounds <https://jira.opnfv.org/issues/?filter=11204>`_ 'https://jira.opnfv.org/issues/?filter=11204'
+`Workarounds <https://jira.opnfv.org/issues/?filter=11408>`_ 'https://jira.opnfv.org/issues/?filter=11408'
 
 (Also See respective Integrated feature project's bug tracking)
 
 ============
 Test results
 ============
-The Colorado 2.0 release with the Fuel deployment tool has undergone QA test
+The Colorado 3.0 release with the Fuel deployment tool has undergone QA test
 runs, see separate test results.
 
 ==========
 References
 ==========
-For more information on the OPNFV Colorado 2.0 release, please see:
+For more information on the OPNFV Colorado 3.0 release, please see:
 
 OPNFV
 =====
@@ -251,10 +251,10 @@ Fuel
 Fuel in OPNFV
 =============
 
-13) `OPNFV Installation instruction for the Colorado 2.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html'
+13) `OPNFV Installation instruction for the Colorado 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/installationprocedure/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/3.0/docs/installationprocedure/index.html'
 
-14) `OPNFV Build instruction for the Colorado 2.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html'
+14) `OPNFV Build instruction for the Colorado 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/buildprocedure/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/3.0/docs/buildprocedure/index.html'
 
-15) `OPNFV Release Note for the Colorado 2.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html'
+15) `OPNFV Release Note for the Colorado 3.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/3.0/docs/releasenotes/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/3.0/docs/releasenotes/index.html'
 
 .. [1] OpenDaylight Beryllium SR3 is used when BGP VPN is enabled in Fuel plugin.