diff options
| -rwxr-xr-x | ci/03-maasdeploy.sh | 26 | ||||
| -rw-r--r-- | docs/release/installation/installationprocedure.rst | 2 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 32 | ||||
| -rw-r--r-- | labconfig/orange/pod2/labconfig.yaml | 16 |
4 files changed, 51 insertions, 25 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 329931e2..4307088f 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -577,6 +577,9 @@ if [ -e ./labconfig.json ]; then # We have no vlan specified on spaces, but we have a vlan subinterface IF_VLAN = ${IF_NAME##*.}; fi + # in case of interface renaming + IF_NEWNAME=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].nics[] | select(.ifname==\"$IF_NAME\") ".rename) + # In case of a VLAN interface if ([ $IF_VLAN ] && [ "$IF_VLAN" != "null" ]); then echo " >>> Configuring VLAN $IF_VLAN" @@ -586,24 +589,37 @@ if [ -e ./labconfig.json ]; then if [[ -z $INTERFACE ]]; then # parent interface is not set because it does not have a SUBNET_CIDR PARENT_VLANID=$(maas $PROFILE fabrics read | jq ".[].vlans[] | select(.fabric_id==$FABRICID and .name==\"untagged\")".id) + # If we need to rename the interface, use new interface name + if ([ $IF_NEWNAME ] && [ "$IF_NEWNAME" != "null" ]); then + PARENT_IF_NAME=${IF_NEWNAME%%.*} + IF_NAME=$IF_NEWNAME + else + PARENT_IF_NAME=${IF_NAME%%.*} + fi # We set the physical interface to the targeted fabric - PARENT_IF_NAME=${IF_NAME%%.*} maas $PROFILE interface update $NODE_SYS_ID $PARENT_IF_NAME vlan=$PARENT_VLANID - sleep 3 + sleep 2 INTERFACE=$(maas $PROFILE interfaces read $NODE_SYS_ID | jq ".[] | select(.vlan.fabric_id==$FABRICID)".id) fi maas $PROFILE interfaces create-vlan $NODE_SYS_ID vlan=$VLANID parent=$INTERFACE || true + elif ([ $IF_NEWNAME ] && [ "$IF_NEWNAME" != "null" ]); then + # rename interface if needed + maas $PROFILE interface update $NODE_SYS_ID $IF_NAME name=$IF_NEWNAME + IF_NAME=$IF_NEWNAME fi - # Configure the interface if ([ $SUBNET_CIDR ] && [ "$SUBNET_CIDR" != "null" ]); then VLANID=$(maas $PROFILE subnet read $SUBNET_CIDR | jq -r '.vlan.id') - maas $PROFILE interface update $NODE_SYS_ID $IF_NAME vlan=$VLANID + if !([ $IF_VLAN ] && [ "$IF_VLAN" != "null" ]); then + # If this interface is not a VLAN (done withe create-vlan) + maas $PROFILE interface update $NODE_SYS_ID $IF_NAME vlan=$VLANID + fi maas $PROFILE interface link-subnet $NODE_SYS_ID $IF_NAME mode=$IF_MODE subnet=$SUBNET_CIDR || true - sleep 5 + sleep 2 else echo " >>> Not configuring, we have an empty Subnet CIDR" fi + done done fi diff --git a/docs/release/installation/installationprocedure.rst b/docs/release/installation/installationprocedure.rst index 159741e0..98d0cb87 100644 --- a/docs/release/installation/installationprocedure.rst +++ b/docs/release/installation/installationprocedure.rst @@ -220,7 +220,7 @@ then run the below commands to start the MAAS deployment. or `` ./03-maasdeploy.sh custom http://<web site location>/labconfig.yaml `` -For deployment of Danbue release on KVM please use the following command. +For deployment of Danube release on KVM please use the following command. `` ./03-maasdeploy.sh default `` diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index a0d79579..aff95d4b 100644 --- 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 Denbue release of +This document compiles the release notes for the Danube 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 Denbue release of OPNFV. +tool for the Danube release of OPNFV. -The goal of the Denbue release and this JOID based deployment process is +The goal of the Danube 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 ======= - Denbue release with the JOID deployment toolchain will establish an OPNFV target system on a Pharos compliant lab infrastructure. +The Danube 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 Denbue. Ceph is setup as 3 OSDs and 3 Monitors, one radosgw. +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 Danube. 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/denbue | +| | stable/danube | +--------------------------------------+--------------------------------------+ | **Release designation** | Denbue release | | | | +--------------------------------------+--------------------------------------+ -| **Release date** | March 22 2017 | +| **Release date** | March 31 2017 | | | | +--------------------------------------+--------------------------------------+ -| **Purpose of the delivery** | Denbue release | +| **Purpose of the delivery** | Danube release | | | | +--------------------------------------+--------------------------------------+ @@ -86,14 +86,14 @@ Version change Module version change ~~~~~~~~~~~~~~~~~~~~~ - Denbue release with the JOID deployment toolchain. + - Danube release with the JOID deployment toolchain. - OpenStack (Newton release) - OpenDaylight (Boron release) - Ubuntu 16.04 LTS Document version change ~~~~~~~~~~~~~~~~~~~~~~~ -- OPNFV Installation instructions for the Denbue release using JOID deployment +- OPNFV Installation instructions for the Danube release using JOID deployment toolchain - ver. 1.0.0 - OPNFV Release Notes with the JOID deployment toolchain - ver. 1.0.0 (this document) @@ -173,7 +173,7 @@ See JIRA: <link> Test Result =========== -Denbue test result using JOID as deployment tool. +Danube test result using JOID as deployment tool. - `https://build.opnfv.org/ci/view/joid/job/functest-joid-baremetal-daily-colorado/>`_ - `https://build.opnfv.org/ci/view/joid/job/yardstick-joid-baremetal-daily-colorado/>`_ @@ -217,8 +217,8 @@ Notes: References ========== -For more information on the OPNFV Denbue release, please visit -- `OPNFV Denbue release <http://www.opnfv.org/colorado>`_ +For more information on the OPNFV Danube release, please visit +- `OPNFV Danube release <http://www.opnfv.org/danube>`_ Juju ---- @@ -234,8 +234,8 @@ JOID ---- - `OPNFV JOID wiki <https://wiki.opnfv.org/joid>`_ - `OPNFV JOID User Guide <https://wiki.opnfv.org/joid/b_userguide>`_ -- `OPNFV Release Notes <https://wiki.opnfv.org/display/joid/Denbue+Release+Notes>`_ -- `OPNFV JOID Install Guide <https://wiki.opnfv.org/display/joid/Denbue+installation+Guide>`_ +- `OPNFV Release Notes <https://wiki.opnfv.org/display/joid/Danube+Release+Notes>`_ +- `OPNFV JOID Install Guide <https://wiki.opnfv.org/display/joid/Danube+installation+Guide>`_ OpenStack --------- diff --git a/labconfig/orange/pod2/labconfig.yaml b/labconfig/orange/pod2/labconfig.yaml index 402df37a..7e19abca 100644 --- a/labconfig/orange/pod2/labconfig.yaml +++ b/labconfig/orange/pod2/labconfig.yaml @@ -11,9 +11,11 @@ lab: spaces: [admin] mac: ["1c:98:ec:11:ad:08"] - ifname: eno2.2056 + rename: eno99.2056 spaces: [public] mac: ["1c:98:ec:11:ad:09"] - ifname: eno2 + rename: eno99 spaces: [floating] mac: ["1c:98:ec:11:ad:09"] - ifname: eno3 @@ -32,9 +34,11 @@ lab: spaces: [admin] mac: ["1c:98:ec:11:c2:c4"] - ifname: eno2.2056 + rename: eno99.2056 spaces: [public] mac: ["1c:98:ec:11:c2:c5"] - ifname: eno2 + rename: eno99 spaces: [floating] mac: ["1c:98:ec:11:c2:c5"] - ifname: eno3 @@ -53,9 +57,11 @@ lab: spaces: [admin] mac: ["1c:98:ec:11:9d:c4"] - ifname: eno2.2056 + rename: eno99.2056 spaces: [public] mac: ["1c:98:ec:11:9c:c5"] - ifname: eno2 + rename: eno99 spaces: [floating] mac: ["1c:98:ec:11:9c:c5"] - ifname: eno3 @@ -74,9 +80,11 @@ lab: spaces: [admin] mac: ["1c:98:ec:1c:5d:88"] - ifname: ens3f0.2056 + rename: eno99.2056 spaces: [public] mac: ["a0:36:9f:1f:67:1c"] - ifname: ens3f0 + rename: eno99 spaces: [floating] mac: ["a0:36:9f:1f:67:1c"] - ifname: ens3f1 @@ -95,9 +103,11 @@ lab: spaces: [admin] mac: ["1c:98:ec:1d:84:7c"] - ifname: ens3f0.2056 + rename: eno99.2056 spaces: [public] mac: ["a0:36:9f:1f:66:a4"] - ifname: ens3f0 + rename: eno99 spaces: [floating] mac: ["a0:36:9f:1f:66:a4"] - ifname: ens3f1 @@ -109,7 +119,7 @@ lab: user: Administrator pass: opnfv2017 floating-ip-range: 161.105.231.4,161.105.231.62,161.105.231.1,161.105.231.0/26 - ext-port: "ens3f0" + ext-port: "eno99" dns: 10.2.0.1 osdomainname: opnfv: @@ -141,6 +151,6 @@ opnfv: vlan: 2056 - type: floating bridge: brFloating - cidr: + cidr: gateway: - vlan: + vlan: |