Merge "Remove the env var KUBECONFIG"

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index a6b311d..869d97e 100755 (executable)
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -209,16 +209,13 @@ sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ |
 sudo virsh pool-start default || true
 sudo virsh pool-autostart default || true
 
-# In case of virtual install set network
-if [ "$virtinstall" -eq 1 ]; then
-    sudo virsh net-dumpxml default > default-net-org.xml
-    sed -i '/dhcp/d' default-net-org.xml
-    sed -i '/range/d' default-net-org.xml
-    sudo virsh net-destroy default
-    sudo virsh net-define default-net-org.xml
-    sudo virsh net-start default
-    rm -f default-net-org.xml
-fi
+# As we use kvm so setup network on admin network
+ADMIN_BR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.bridge | cut -d \" -f 2 `
+sed -i "s@brAdm@$ADMIN_BR@" net.xml
+sudo virsh net-destroy default || true
+sudo virsh net-undefine default || true
+sudo virsh net-define net.xml || true
+sudo virsh net-start default || true
 
 #
 # Cleanup, juju init and config backup
@@ -465,9 +462,7 @@ addnodes(){
         VIRSHIP=""  # TODO: parse from $VIRSHURL if needed
     fi
 
-    if [ "$virtinstall" -eq 1 ]; then
-        netw=" --network bridge=virbr0,model=virtio"
-    elif ([ "$VIRSHHOST" != "" ]); then
+    if ([ "$VIRSHHOST" != "" ]); then
         # Get the bridge hosting the remote virsh
         brid=$(ssh $VIRSHHOST "ip a l | grep $VIRSHHOST | perl -pe 's/.* (.*)\$/\$1/g'")
         netw=" --network bridge=$brid,model=virtio"

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 49bd4f7..33bbbd8 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -1,7 +1,17 @@
-    mongodb:
-      charm: ./{{ ubuntu.release }}/mongodb
+    gnocchi:
+      charm: ./{{ ubuntu.release }}/gnocchi
+      num_units: 1
+{% if os.service.bindings %}
+      bindings:
+        "": *internal-space
+{% endif %}
+      options:
+        openstack-origin: *openstack-origin
+      to:
+        - "lxd:nodes/0"
+    memcached:
+      charm: ./{{ ubuntu.release }}/memcached
       num_units: 1
-      constraints: *oam-space-constr
 {% if os.service.bindings %}
       bindings:
         "": *internal-space

diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
index 2ed75e6..9fd234f 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml
@@ -5,10 +5,15 @@
     - [ 'nova-cloud-controller:quantum-network-service', 'neutron-gateway:quantum-network-service' ]
     - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ]
     - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ]
-    - [ 'ceilometer:identity-service', 'keystone:identity-service' ]
     - [ 'ceilometer:identity-notifications', 'keystone:identity-notifications' ]
     - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ]
-    - [ 'ceilometer:shared-db', 'mongodb:database' ]
+    - [ 'gnocchi:storage-ceph', 'ceph-mon:client' ]
+    - [ 'gnocchi:shared-db', 'mysql:shared-db' ]
+    - [ 'gnocchi:amqp', 'rabbitmq-server:amqp' ]
+    - [ 'gnocchi:coordinator-memcached', 'memcached:cache' ]
+    - [ 'gnocchi:metric-service', 'ceilometer:metric-service' ]
+    - [ 'gnocchi:identity-service', 'keystone:identity-service' ]
+    - [ 'ceilometer:identity-credentials', 'keystone:identity-credentials' ]
 {% endif %}
     - [ 'heat:shared-db', 'mysql:shared-db' ]
     - [ 'heat:identity-service', 'keystone:identity-service' ]

diff --git a/ci/net.xml b/ci/net.xml
new file mode 100644 (file)
index 0000000..110428f
--- /dev/null
+++ b/ci/net.xml
@@ -0,0 +1,5 @@
+<network>
+  <name>default</name>
+  <forward mode='bridge'/>
+  <bridge name='brAdm'/>
+</network>

diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 2bf7831..a38518f 100755 (executable)
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -34,8 +34,9 @@ git clone -b stable/18.02 https://github.com/openstack/charm-heat.git $distro/he
 git clone -b stable/18.02 https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
+charm pull cs:memcached $distro/memcached
+charm pull cs:gnocchi $distro/gnocchi
 charm pull cs:$distro/aodh $distro/aodh
-charm pull cs:$distro/mongodb $distro/mongodb
 charm pull cs:ntp $distro/ntp
 charm pull cs:$distro/haproxy $distro/haproxy
 charm pull cs:~narindergupta/congress-1 $distro/congress

diff --git a/docs/release/configguide/configguide.rst b/docs/release/configguide/configguide.rst
index b9c27f3..209f6cb 100644 (file)
--- a/docs/release/configguide/configguide.rst
+++ b/docs/release/configguide/configguide.rst
@@ -4,7 +4,7 @@ JOID Configuration
 Scenario 1: Nosdn
 -----------------
 
-*./deploy.sh -o ocata -s nosdn -t ha -l custom -f none -d xenial -m openstack*
+*./deploy.sh -o pike -s nosdn -t ha -l custom -f none -d xenial -m openstack*
 
 Scenario 2: Kubernetes core
 ---------------------------

diff --git a/docs/release/installation/abstract.rst b/docs/release/installation/abstract.rst
index 4303ec6..3a2c09a 100644 (file)
--- a/docs/release/installation/abstract.rst
+++ b/docs/release/installation/abstract.rst
@@ -1,7 +1,7 @@
 Abstract
 ========
 
-This document will explain how to install the Euphrates release of OPNFV with
+This document will explain how to install the Fraser release of OPNFV with
 JOID including installing JOID, configuring JOID for your environment, and
 deploying OPNFV with different SDN solutions in HA, or non-HA mode.
 

diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 042dd0e..e86521b 100644 (file)
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -6,16 +6,16 @@
 Abstract
 ========
 
-This document compiles the release notes for the Euphrates release of
+This document compiles the release notes for the Fraser release of
 OPNFV when using JOID as a deployment tool.
 
 Introduction
 ============
 
 These notes provides release information for the use of joid as deployment
-tool for the Euphrates release of OPNFV.
+tool for the Fraser release of OPNFV.
 
-The goal of the Euphrates release and this JOID based deployment process is
+The goal of the Fraser release and this JOID based deployment process is
 to establish a lab ready platform accelerating further development
 of the OPNFV infrastructure.
 
@@ -25,11 +25,11 @@ OPNFV using JOID which is based on MAAS and Juju.
 Summary
 =======
 
-The Euphrates release with the JOID deployment toolchain will establish an OPNFV target system on a Pharos compliant lab infrastructure.
+The Fraser release with the JOID deployment toolchain will establish an OPNFV target system on a Pharos compliant lab infrastructure.
 The current definition of an OPNFV target system is and OpenStack Newton combined with OpenDaylight Boron.
 
 The system is deployed with OpenStack High Availability (HA) for most OpenStack services.
-Ceph storage is used as Cinder backend, and is the only supported storage for Euphrates. Ceph is setup as 3 OSDs and 3 Monitors, one radosgw.
+Ceph storage is used as Cinder backend, and is the only supported storage for Fraser. Ceph is setup as 3 OSDs and 3 Monitors, one radosgw.
 
     User has following choices to make to do the deployment.
 
@@ -54,15 +54,15 @@ Release Data
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Repo/tag**                         | gerrit.opnfv.org/gerrit/joid.git     |
-|                                      | stable/euphrates                     |
+|                                      | stable/fraser                     |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | Euphrates release                    |
+| **Release designation**              | Fraser release                    |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Release date**                     | December 15 2017                      |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Euphrates release                    |
+| **Purpose of the delivery**          | Fraser release                    |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -86,14 +86,14 @@ Version change
 
 Module version change
 ~~~~~~~~~~~~~~~~~~~~~
-  - Euphrates release with the JOID deployment toolchain.
+  - Fraser release with the JOID deployment toolchain.
   - OpenStack (Ocata release)
   - Kubernetes 1.8
   - Ubuntu 16.04 LTS
 
 Document version change
 ~~~~~~~~~~~~~~~~~~~~~~~
-- OPNFV Installation instructions for the Euphrates release using JOID deployment
+- OPNFV Installation instructions for the Fraser release using JOID deployment
   toolchain - ver. 1.0.0
 - OPNFV Release Notes with the JOID deployment toolchain - ver. 1.0.0 (this document)
 
@@ -172,41 +172,41 @@ See JIRA: <link>
 Scenario Releases
 =================
 Name:      joid-os-nosdn-nofeature-ha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-nofeature-ha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-nofeature-ha-baremetal-daily-fraser/
 Notes:
 
 Name:      joid-os-nosdn-lxd-ha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-lxd-ha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-lxd-ha-baremetal-daily-fraser/
 Notes:
 
 Name:      joid-os-nosdn-lxd-noha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-lxd-noha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-lxd-noha-baremetal-daily-fraser/
 Notes:
 
 Name:      joid-os-nosdn-nofeature-noha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-nofeature-noha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-nosdn-nofeature-noha-baremetal-daily-fraser/
 Notes:
 
 Name:      joid-k8-nosdn-lb-noha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-k8-nosdn-lb-noha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-k8-nosdn-lb-noha-baremetal-daily-fraser/
 Notes:
 
 Name:      joid-k8-ovn-lb-noha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-k8-ovn-lb-noha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-k8-ovn-lb-noha-baremetal-daily-fraser/
 Notes:
 
 Name:      joid-os-ocl-nofeature-ha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-ocl-nofeature-ha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-ocl-nofeature-ha-baremetal-daily-fraser/
 Notes:
 
 Name:      joid-os-ocl-nofeature-noha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-ocl-nofeature-noha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-os-ocl-nofeature-noha-baremetal-daily-fraser/
 Notes:
 
 References
 ==========
-For more information on the OPNFV Euphrates release, please visit
-- `OPNFV Euphrates release <http://www.opnfv.org/euphrates>`_
+For more information on the OPNFV Fraser release, please visit
+- `OPNFV Fraser release <http://www.opnfv.org/fraser>`_
 
 Juju
 ----

diff --git a/docs/release/scenarios/k8-ovn-lb-noha/release-notes.rst b/docs/release/scenarios/k8-ovn-lb-noha/release-notes.rst
index 9e92374..0a9938e 100644 (file)
--- a/docs/release/scenarios/k8-ovn-lb-noha/release-notes.rst
+++ b/docs/release/scenarios/k8-ovn-lb-noha/release-notes.rst
@@ -6,17 +6,17 @@
 Abstract
 ========
 
-This document compiles the release notes for the Euphrates release of
+This document compiles the release notes for the Fraser release of
 OPNFV when using JOID as a deployment tool for Kubernets and load balancer.
 
 Introduction
 ============
 
 These notes provides release information for the use of joid as deployment
-tool for the Euphrates release of OPNFV for Kubernets and load balancer
+tool for the Fraser release of OPNFV for Kubernets and load balancer
 scenario.
 
-The goal of the Euphrates release and this JOID based deployment process is
+The goal of the Fraser release and this JOID based deployment process is
 to establish a lab ready platform accelerating further development
 of the OPNFV infrastructure for docker based workloads.
 
@@ -46,7 +46,7 @@ EasyRSA
 Etcd (distributed key value store)
  Minimum Three node cluster for reliability.
 
-Euphrates release with the JOID deployment with Kubernetes with load balancer will establish an
+Fraser release with the JOID deployment with Kubernetes with load balancer will establish an
 OPNFV target system on a Pharos compliant lab infrastructure.
 
 NOTE: Detailed information on how to install in your lab can be find in installation guide
@@ -105,15 +105,15 @@ Release Data
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Repo/tag**                         | gerrit.opnfv.org/gerrit/joid.git     |
-|                                      | stable/euphrates                     |
+|                                      | stable/fraser                     |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | Euphrates release                    |
+| **Release designation**              | Fraser release                    |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | March 31 2017                        |
+| **Release date**                     | March 31 2018                        |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Euphrates release                    |
+| **Purpose of the delivery**          | Fraser release                    |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -146,7 +146,7 @@ Known issues
 Scenario Releases
 =================
 Name:      joid-k8-ovn-lb-noha
-Test Link: https://build.opnfv.org/ci/view/joid/job/joid-k8-ovn-lb-noha-baremetal-daily-euphrates/
+Test Link: https://build.opnfv.org/ci/view/joid/job/joid-k8-ovn-lb-noha-baremetal-daily-fraser/
 Notes:
 
 References

diff --git a/docs/release/scenarios/os-nosdn-openbaton-ha/release-notes.rst b/docs/release/scenarios/os-nosdn-openbaton-ha/release-notes.rst
index da55e4c..51ea0de 100644 (file)
--- a/docs/release/scenarios/os-nosdn-openbaton-ha/release-notes.rst
+++ b/docs/release/scenarios/os-nosdn-openbaton-ha/release-notes.rst
@@ -6,7 +6,7 @@
 Abstract
 ========
 
-This document compiles the release notes for the Euphrates release of
+This document compiles the release notes for the Fraser release of
 OPNFV when using JOID as a deployment tool with the Open Baton NFV MANO framework
  provided by the OPNFV orchestra project.
 
@@ -14,10 +14,10 @@ Introduction
 ============
 
 These notes provides release information for the use of joid as deployment
-tool for the Euphrates release of OPNFV for orchestra
+tool for the Fraser release of OPNFV for orchestra
 scenario.
 
-The goal of the Euphrates release and this JOID based deployment process is
+The goal of the Fraser release and this JOID based deployment process is
 to establish a lab ready platform accelerating further development
 of the OPNFV infrastructure.
 
@@ -32,7 +32,7 @@ Open Baton is the result of an agile design process having as major objective th
 of an extensible and customizable framework capable of orchestrating network services across
 heterogeneous NFV Infrastructures.
 
-Euphrates release with the JOID deployment enables deployment of orchestra
+Fraser release with the JOID deployment enables deployment of orchestra
  on a Pharos compliant lab infrastructure.
 
 The current definition of an OPNFV target system is based on OpenStack Ocata.
@@ -76,15 +76,15 @@ Release Data
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Repo/tag**                         | gerrit.opnfv.org/gerrit/joid.git     |
-|                                      | stable/euphrates                     |
+|                                      | stable/hrates                     |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | Euphrates release                    |
+| **Release designation**              | Fraser release                       |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | October 24 2017                      |
+| **Release date**                     | March 31 2018                        |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | Euphrates release                    |
+| **Purpose of the delivery**          | Fraser release                       |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -115,7 +115,7 @@ Scenario Releases
 =================
 
 Name:      os-nosdn-openbaton-ha
-Test Link: https://build.opnfv.org/ci/job/joid-deploy-baremetal-daily-euphrates
+Test Link: https://build.opnfv.org/ci/job/joid-deploy-baremetal-daily-hrates
 Notes:
 
 References
@@ -147,6 +147,6 @@ OpenStack
 
 Orchestra
 ---------
-- `Orchestra Release Notes <http://docs.opnfv.org/en/stable-euphrates/submodules/orchestra/docs/release/release-notes/index.html#orchestra-releasenotes>`_
+- `Orchestra Release Notes <http://docs.opnfv.org/en/stable-hrates/submodules/orchestra/docs/release/release-notes/index.html#orchestra-releasenotes>`_
 - `Open Baton documentation <http://openbaton.github.io/documentation/>`_
 

diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst
index 63911a0..4ef228f 100644 (file)
--- a/docs/release/userguide/userguide.rst
+++ b/docs/release/userguide/userguide.rst
@@ -1,7 +1,7 @@
 
 Introduction
 ============
-This document will explain how to install OPNFV Euphrates with JOID including installing JOID, configuring JOID for your environment, and deploying OPNFV with different SDN solutions in HA, or non-HA mode. Prerequisites include
+This document will explain how to install OPNFV Fraser with JOID including installing JOID, configuring JOID for your environment, and deploying OPNFV with different SDN solutions in HA, or non-HA mode. Prerequisites include
 
 - An Ubuntu 16.04 LTS Server Jumphost
 - Minimum 2 Networks per Pharos requirement