Merge "Adding kickstart file for iso verify"

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 0910a5f..e29b0c7 100644 (file)
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -31,7 +31,7 @@ parameter_defaults:
         key: 'os_compute_api:servers:show:host_status'
         value: 'rule:admin_or_owner'
     nova::api::default_floating_pool: 'external'
-    #VPP routing node, used for odl_l3-fdio only.
+    #VPP routing node, used for odl-fdio only.
     #opendaylight::vpp_routing_node: overcloud-novacompute-0.opnfvlf.org
   ControllerServices:
     - OS::TripleO::Services::CACerts

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 9de6d9a..963579f 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -68,13 +68,6 @@ pushd puppet-tacker > /dev/null
 git archive --format=tar.gz --prefix=tacker/ origin/stable/ocata > ${BUILD_DIR}/puppet-tacker.tar.gz
 popd > /dev/null
 
-# tar up the ovn puppet module
-rm -rf puppet-ovn
-git clone https://github.com/openstack/puppet-ovn
-pushd puppet-ovn > /dev/null
-git archive --format=tar.gz --prefix=ovn/ origin/stable/ocata > ${BUILD_DIR}/puppet-ovn.tar.gz
-popd > /dev/null
-
 # Master FD.IO Repo
 cat > ${BUILD_DIR}/fdio.repo << EOF
 [fdio-master]
@@ -158,8 +151,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install /root/$tacker_pkg \
     --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \
     --install /root/$tackerclient_pkg \
-    --upload ${BUILD_DIR}/puppet-ovn.tar.gz:/etc/puppet/modules/ \
-    --run-command "cd /etc/puppet/modules/ && rm -fr ovn && tar xzf puppet-ovn.tar.gz" \
     --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \
     --run-command "mkdir /root/ovs27" \
     --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \

diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index c1bf296..d063ba6 100644 (file)
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -46,18 +46,17 @@ install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/op
 install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml
 install config/deploy/os-nosdn-kvm-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
 install config/deploy/os-nosdn-kvm-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
-install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
 install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
 install config/deploy/os-odl-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
 install config/deploy/os-odl-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
 install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
 install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
-install config/deploy/os-odl_l3-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-fdio-noha.yaml
-install config/deploy/os-odl_l3-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-fdio-ha.yaml
-install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
-install config/deploy/os-odl_l3-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-noha.yaml
-install config/deploy/os-odl_l3-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-ovs-ha.yaml
-install config/deploy/os-odl_l3-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-ovs-noha.yaml
+install config/deploy/os-odl-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
+install config/deploy/os-odl-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml
+install config/deploy/os-odl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml
+install config/deploy/os-odl-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml
+install config/deploy/os-odl-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs-ha.yaml
+install config/deploy/os-odl-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs-noha.yaml
 install config/deploy/os-odl-gluon-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml
 install config/deploy/os-ovn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml
 #install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
@@ -132,18 +131,17 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l3-fdio-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l3-fdio-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l3-ovs-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l3-ovs-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-ovs-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-ovs-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml
 #%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
@@ -163,6 +161,9 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
+* Wed Mar 29 2017 Dan Radez <dradez@redhat.com> - 4.0-9
+- Remove odl_l2-nofeature scenario file
+- rename all odl_l3 scenario files to odl
 * Thu Mar 23 2017 Tim Rozet <trozet@redhat.com> - 4.0-8
 - Adds os-odl_l3-ovs-ha and noha scenarios
 * Mon Mar 12 2017 Feng Pan <fpan@redhat.com> - 4.0-7

diff --git a/build/undercloud.sh b/build/undercloud.sh
index e3194e2..de96f02 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -67,7 +67,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install "openstack-heat-api" \
     --upload ${BUILD_ROOT}/patches/0001-Removes-doing-yum-update.patch:/usr/lib/python2.7/site-packages/ \
     --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < 0001-Removes-doing-yum-update.patch" \
-    --root-password password:stack \
     -a undercloud_build.qcow2
 
 mv -f undercloud_build.qcow2 undercloud.qcow2

diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index c92a175..aedd197 100644 (file)
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -81,7 +81,7 @@ deploy_options:
   #      # This is currently the only available option in the nova section. It will
   #      # add the provided string to vcpu_pin_set in nova.conf. This is used to pin
   #      # guest VMs to a set of CPU cores, and is decsribed in more detail here:
-  #      # http://docs.openstack.org/newton/config-reference/compute/config-options.html
+  #      # http://docs.openstack.org/ocata/config-reference/compute/config-options.html
   #      libvirtpin: 1
   #    kernel:
   #      # On compute nodes, isolcpus is usually used to reserve cores for use either by VMs

diff --git a/config/deploy/os-odl-csit-noha.yaml b/config/deploy/os-odl-csit-noha.yaml
new file mode 100644 (file)
index 0000000..ad61e26
--- /dev/null
+++ b/config/deploy/os-odl-csit-noha.yaml
@@ -0,0 +1,12 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: false
+  ceph: false

diff --git a/config/deploy/os-odl-fdio-ha.yaml b/config/deploy/os-odl-fdio-ha.yaml
new file mode 100644 (file)
index 0000000..af81e5a
--- /dev/null
+++ b/config/deploy/os-odl-fdio-ha.yaml
@@ -0,0 +1,37 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: true
+  odl_version: carbon
+  odl_vpp_routing_node: overcloud-novacompute-0
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  vpp: true
+  dataplane: fdio
+  performance:
+    Controller:
+      kernel:
+        hugepages: 1024
+        hugepagesz: 2M
+        intel_iommu: 'on'
+        iommu: pt
+        isolcpus: 1,2
+      vpp:
+        main-core: 1
+        corelist-workers: 2
+        uio-driver: uio_pci_generic
+    Compute:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 2048
+        intel_iommu: 'on'
+        iommu: pt
+        isolcpus: 1,2
+      vpp:
+        main-core: 1
+        corelist-workers: 2
+        uio-driver: uio_pci_generic

diff --git a/config/deploy/os-odl-fdio-noha.yaml b/config/deploy/os-odl-fdio-noha.yaml
new file mode 100644 (file)
index 0000000..adb37f3
--- /dev/null
+++ b/config/deploy/os-odl-fdio-noha.yaml
@@ -0,0 +1,37 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: true
+  odl_version: carbon
+  odl_vpp_routing_node: overcloud-novacompute-0
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  vpp: true
+  dataplane: fdio
+  performance:
+    Controller:
+      kernel:
+        hugepages: 1024
+        hugepagesz: 2M
+        intel_iommu: 'on'
+        iommu: pt
+        isolcpus: 1,2
+      vpp:
+        main-core: 1
+        corelist-workers: 2
+        uio-driver: uio_pci_generic
+    Compute:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 2048
+        intel_iommu: 'on'
+        iommu: pt
+        isolcpus: 1,2
+      vpp:
+        main-core: 1
+        corelist-workers: 2
+        uio-driver: uio_pci_generic

diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
new file mode 100644 (file)
index 0000000..d421c7c
--- /dev/null
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -0,0 +1,11 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false

diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
new file mode 100644 (file)
index 0000000..972b1f8
--- /dev/null
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -0,0 +1,11 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false

diff --git a/config/deploy/os-odl-ovs-ha.yaml b/config/deploy/os-odl-ovs-ha.yaml
new file mode 100644 (file)
index 0000000..ad26569
--- /dev/null
+++ b/config/deploy/os-odl-ovs-ha.yaml
@@ -0,0 +1,27 @@
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  dataplane: ovs_dpdk
+  performance:
+    Controller:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 1024
+    Compute:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 2048
+        intel_iommu: 'on'
+        iommu: pt
+      ovs:
+        socket_memory: 1024
+        pmd_cores: 2
+        dpdk_cores: 1

diff --git a/config/deploy/os-odl-ovs-noha.yaml b/config/deploy/os-odl-ovs-noha.yaml
new file mode 100644 (file)
index 0000000..6f7630d
--- /dev/null
+++ b/config/deploy/os-odl-ovs-noha.yaml
@@ -0,0 +1,27 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
+  dataplane: ovs_dpdk
+  performance:
+    Controller:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 1024
+    Compute:
+      kernel:
+        hugepagesz: 2M
+        hugepages: 2048
+        intel_iommu: 'on'
+        iommu: pt
+      ovs:
+        socket_memory: 1024
+        pmd_cores: 2
+        dpdk_cores: 1

diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
deleted file mode 120000 (symlink)
index dc20f6f..0000000
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ /dev/null
@@ -1 +0,0 @@
-os-odl_l3-nofeature-ha.yaml
\ No newline at end of file

diff --git a/config/deploy/os-odl_l3-csit-noha.yaml b/config/deploy/os-odl_l3-csit-noha.yaml
deleted file mode 100644 (file)
index ad61e26b4de0218416a2224c33535624d3f5607a..0000000000000000000000000000000000000000
--- a/config/deploy/os-odl_l3-csit-noha.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: boron
-  sdn_l3: true
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: false
-  ceph: false

diff --git a/config/deploy/os-odl_l3-csit-noha.yaml b/config/deploy/os-odl_l3-csit-noha.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..06ddcde43fdf24bb6fccef63a036a8e855b55057
--- /dev/null
+++ b/config/deploy/os-odl_l3-csit-noha.yaml
@@ -0,0 +1 @@
+os-odl-csit-noha.yaml
\ No newline at end of file

diff --git a/config/deploy/os-odl_l3-fdio-ha.yaml b/config/deploy/os-odl_l3-fdio-ha.yaml
deleted file mode 100644 (file)
index af81e5a5bc86beaedd7152b6a7754271680ebc5b..0000000000000000000000000000000000000000
--- a/config/deploy/os-odl_l3-fdio-ha.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: true
-  odl_version: carbon
-  odl_vpp_routing_node: overcloud-novacompute-0
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  vpp: true
-  dataplane: fdio
-  performance:
-    Controller:
-      kernel:
-        hugepages: 1024
-        hugepagesz: 2M
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic
-    Compute:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 2048
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic

diff --git a/config/deploy/os-odl_l3-fdio-ha.yaml b/config/deploy/os-odl_l3-fdio-ha.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..42bed3dd4850ed53ccc4efed85e6ed60d8ef3938
--- /dev/null
+++ b/config/deploy/os-odl_l3-fdio-ha.yaml
@@ -0,0 +1 @@
+os-odl-fdio-ha.yaml
\ No newline at end of file

diff --git a/config/deploy/os-odl_l3-fdio-noha.yaml b/config/deploy/os-odl_l3-fdio-noha.yaml
deleted file mode 100644 (file)
index adb37f3dc2c105243e8dd2eb51592eab1771921d..0000000000000000000000000000000000000000
--- a/config/deploy/os-odl_l3-fdio-noha.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: true
-  odl_version: carbon
-  odl_vpp_routing_node: overcloud-novacompute-0
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  vpp: true
-  dataplane: fdio
-  performance:
-    Controller:
-      kernel:
-        hugepages: 1024
-        hugepagesz: 2M
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic
-    Compute:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 2048
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic

diff --git a/config/deploy/os-odl_l3-fdio-noha.yaml b/config/deploy/os-odl_l3-fdio-noha.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..d8b983eb61ce73e2ec806d7b78f0c74e82108ef5
--- /dev/null
+++ b/config/deploy/os-odl_l3-fdio-noha.yaml
@@ -0,0 +1 @@
+os-odl-fdio-noha.yaml
\ No newline at end of file

diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
deleted file mode 100644 (file)
index d421c7ca91db571176b58a137399b88d31204701..0000000000000000000000000000000000000000
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: boron
-  sdn_l3: true
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false

diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0334fae917728b94950e47da213b1f4286e60e78
--- /dev/null
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -0,0 +1 @@
+os-odl-nofeature-ha.yaml
\ No newline at end of file

diff --git a/config/deploy/os-odl_l3-nofeature-noha.yaml b/config/deploy/os-odl_l3-nofeature-noha.yaml
deleted file mode 100644 (file)
index 972b1f85741307ad1625e7b124f5331ec8c92201..0000000000000000000000000000000000000000
--- a/config/deploy/os-odl_l3-nofeature-noha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: boron
-  sdn_l3: true
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false

diff --git a/config/deploy/os-odl_l3-nofeature-noha.yaml b/config/deploy/os-odl_l3-nofeature-noha.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..62220520d8bdfc4d1402edb723ff3f7951ff9ddd
--- /dev/null
+++ b/config/deploy/os-odl_l3-nofeature-noha.yaml
@@ -0,0 +1 @@
+os-odl-nofeature-noha.yaml
\ No newline at end of file

diff --git a/config/deploy/os-odl_l3-ovs-ha.yaml b/config/deploy/os-odl_l3-ovs-ha.yaml
deleted file mode 100644 (file)
index ad2656990da7a86a5cc2c646eeda52550a644616..0000000000000000000000000000000000000000
--- a/config/deploy/os-odl_l3-ovs-ha.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: boron
-  sdn_l3: true
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  dataplane: ovs_dpdk
-  performance:
-    Controller:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 1024
-    Compute:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 2048
-        intel_iommu: 'on'
-        iommu: pt
-      ovs:
-        socket_memory: 1024
-        pmd_cores: 2
-        dpdk_cores: 1

diff --git a/config/deploy/os-odl_l3-ovs-ha.yaml b/config/deploy/os-odl_l3-ovs-ha.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..fc68a750a2769deec683d02bdc5475b9d2f4c0bf
--- /dev/null
+++ b/config/deploy/os-odl_l3-ovs-ha.yaml
@@ -0,0 +1 @@
+os-odl-ovs-ha.yaml
\ No newline at end of file

diff --git a/config/deploy/os-odl_l3-ovs-noha.yaml b/config/deploy/os-odl_l3-ovs-noha.yaml
deleted file mode 100644 (file)
index 6f7630dcd6ed8469d65303ed6fee93e4b9409324..0000000000000000000000000000000000000000
--- a/config/deploy/os-odl_l3-ovs-noha.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: boron
-  sdn_l3: true
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  dataplane: ovs_dpdk
-  performance:
-    Controller:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 1024
-    Compute:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 2048
-        intel_iommu: 'on'
-        iommu: pt
-      ovs:
-        socket_memory: 1024
-        pmd_cores: 2
-        dpdk_cores: 1

diff --git a/config/deploy/os-odl_l3-ovs-noha.yaml b/config/deploy/os-odl_l3-ovs-noha.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..9301ced207bbbf1b8b9e5f010811acdc2170d1bd
--- /dev/null
+++ b/config/deploy/os-odl_l3-ovs-noha.yaml
@@ -0,0 +1 @@
+os-odl-ovs-noha.yaml
\ No newline at end of file

diff --git a/contrib/simple_deploy.sh b/contrib/simple_deploy.sh
index a9d1473..f31db3e 100644 (file)
--- a/contrib/simple_deploy.sh
+++ b/contrib/simple_deploy.sh
@@ -14,6 +14,6 @@ make overcloud-opendaylight
 popd
 pushd $apex_home/ci
 echo "All further output will be piped to $PWD/nohup.out"
-(nohup ./deploy.sh -v -n $apex_home/config/network/network_settings.yaml -d $apex_home/config/deploy/os-odl_l3-nofeature-noha.yaml &)
+(nohup ./deploy.sh -v -n $apex_home/config/network/network_settings.yaml -d $apex_home/config/deploy/os-odl-nofeature-noha.yaml &)
 tail -f nohup.out
 popd

diff --git a/docs/release/installation/abstract.rst b/docs/release/installation/abstract.rst
index b2d92a2..534d8a8 100644 (file)
--- a/docs/release/installation/abstract.rst
+++ b/docs/release/installation/abstract.rst
@@ -1,16 +1,16 @@
 Abstract
 ========
 
-This document describes how to install the Danube release of OPNFV when
+This document describes how to install the Euphrates release of OPNFV when
 using Apex as a deployment tool covering it's limitations, dependencies
 and required system resources.
 
 License
 =======
-Danube release of OPNFV when using Apex as a deployment tool Docs
+Euphrates release of OPNFV when using Apex as a deployment tool Docs
 (c) by Tim Rozet (Red Hat) and Dan Radez (Red Hat)
 
-Danube release of OPNFV when using Apex as a deployment tool Docs
+Euphrates release of OPNFV when using Apex as a deployment tool Docs
 are licensed under a Creative Commons Attribution 4.0 International License.
 You should have received a copy of the license along with this.
 If not, see <http://creativecommons.org/licenses/by/4.0/>.

diff --git a/docs/release/installation/architecture.rst b/docs/release/installation/architecture.rst
index ae634cc..eff5d35 100644 (file)
--- a/docs/release/installation/architecture.rst
+++ b/docs/release/installation/architecture.rst
@@ -30,7 +30,7 @@ Undercloud
 ----------
 
 The undercloud is not Highly Available. End users do not depend on the
-underloud. It is only for management purposes.
+undercloud. It is only for management purposes.
 
 Overcloud
 ---------
@@ -47,7 +47,7 @@ will run the following services:
 - Ceph Monitors and OSDs
 
 Stateless OpenStack services
-  All running statesless OpenStack services are load balanced by HA Proxy.
+  All running stateless OpenStack services are load balanced by HA Proxy.
   Pacemaker monitors the services and ensures that they are running.
 
 Stateful OpenStack services
@@ -65,9 +65,13 @@ RabbitMQ
   establishment of clustering across cluster members.
 
 OpenDaylight
-  OpenDaylight is currently installed on all three control nodes but only
-  started on the first control node. OpenDaylight's HA capabilities are not yet
-  mature enough to be enabled.
+  OpenDaylight is currently installed on all three control nodes and started as
+  an HA cluster unless otherwise noted for that scenario.  OpenDaylight's
+  database, known as MD-SAL, breaks up pieces of the database into "shards".
+  Each shard will have its own election take place, which will determine
+  which OpenDaylight node is the leader for that shard.  The other
+  OpenDaylight nodes in the cluster will be in standby.  Every Open vSwitch
+  node connects to every OpenDaylight to enable HA.
 
 HA Proxy
   HA Proxy is monitored by Pacemaker to ensure it is running across all nodes
@@ -127,9 +131,9 @@ issues per scenario.  The following scenarios correspond to a supported
 +-------------------------+-------------+---------------+
 | os-nosdn-ovs-noha       | OVS for NFV | Yes           |
 +-------------------------+-------------+---------------+
-| os-nosdn-fdio-ha        | FDS         | Yes           |
+| os-nosdn-fdio-ha        | FDS         | No            |
 +-------------------------+-------------+---------------+
-| os-nosdn-fdio-noha      | FDS         | Yes           |
+| os-nosdn-fdio-noha      | FDS         | No            |
 +-------------------------+-------------+---------------+
 | os-nosdn-kvm-ha         | KVM for NFV | Yes           |
 +-------------------------+-------------+---------------+

diff --git a/docs/release/installation/baremetal.rst b/docs/release/installation/baremetal.rst
index 83cda32..c7b4740 100644 (file)
--- a/docs/release/installation/baremetal.rst
+++ b/docs/release/installation/baremetal.rst
@@ -50,7 +50,7 @@ images provided by the undercloud.  These disk images include all the necessary
 packages and configuration for an OPNFV deployment to execute.  Once the disk
 images have been written to node's disks the nodes will boot locally and
 execute cloud-init which will execute the final node configuration. This
-configuration is largly completed by executing a puppet apply on each node.
+configuration is largely completed by executing a puppet apply on each node.
 
 Installation High-Level Overview - VM Deployment
 ================================================
@@ -62,7 +62,7 @@ VM a collection of VMs (3 control nodes + 2 compute for an HA deployment or 1
 control node and 1 or more compute nodes for a Non-HA Deployment) will be
 defined for the target OPNFV deployment.  The part of the toolchain that
 executes IPMI power instructions calls into libvirt instead of the IPMI
-interfaces on baremetal servers to operate the power managment.  These VMs are
+interfaces on baremetal servers to operate the power management.  These VMs are
 then provisioned with the same disk images and configuration that baremetal
 would be.
 
@@ -117,7 +117,7 @@ Install Bare Metal Jumphost
     install the opnfv-apex RPMs using the OPNFV artifacts yum repo. This yum
     repo is created at release. It will not exist before release day.
 
-    ``sudo yum install http://artifacts.opnfv.org/apex/danube/opnfv-apex-release-danube.noarch.rpm``
+    ``sudo yum install http://artifacts.opnfv.org/apex/euphrates/opnfv-apex-release-euphrates.noarch.rpm``
 
     Once you have installed the repo definitions for Apex, RDO and EPEL then
     yum install Apex:
@@ -235,7 +235,7 @@ help you customize them.
    (``/etc/opnfv-apex/``). These files are named with the naming convention
    os-sdn_controller-enabled_feature-[no]ha.yaml. These files can be used in
    place of the (``/etc/opnfv-apex/deploy_settings.yaml``) file if one suites
-   your deployment needs. If a pre-built deploy_settings file is choosen there
+   your deployment needs. If a pre-built deploy_settings file is chosen there
    is no need to customize (``/etc/opnfv-apex/deploy_settings.yaml``). The
    pre-built file can be used in place of the
    (``/etc/opnfv-apex/deploy_settings.yaml``) file.

diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst
index 615aa7e..9ac4c22 100644 (file)
--- a/docs/release/installation/index.rst
+++ b/docs/release/installation/index.rst
@@ -22,7 +22,7 @@ Contents:
 
 :Authors: Tim Rozet (trozet@redhat.com)
 :Authors: Dan Radez (dradez@redhat.com)
-:Version: 4.0
+:Version: 5.0
 
 Indices and tables
 ==================

diff --git a/docs/release/installation/introduction.rst b/docs/release/installation/introduction.rst
index 1826784..0e37618 100644 (file)
--- a/docs/release/installation/introduction.rst
+++ b/docs/release/installation/introduction.rst
@@ -1,7 +1,7 @@
 Introduction
 ============
 
-This document describes the steps to install an OPNFV Danube reference
+This document describes the steps to install an OPNFV Euphrates reference
 platform, as defined by the Genesis Project using the Apex installer.
 
 The audience is assumed to have a good background in networking
@@ -19,7 +19,7 @@ deployment tool chain.
 The Apex deployment artifacts contain the necessary tools to deploy and
 configure an OPNFV target system using the Apex deployment toolchain.
 These artifacts offer the choice of using the Apex bootable ISO
-(``opnfv-apex-danube.iso``) to both install CentOS 7 and the
+(``opnfv-apex-euphrates.iso``) to both install CentOS 7 and the
 necessary materials to deploy or the Apex RPMs (``opnfv-apex*.rpm``),
 and their associated dependencies, which expects installation to a
 CentOS 7 libvirt enabled host. The RPM contains a collection of

diff --git a/docs/release/installation/requirements.rst b/docs/release/installation/requirements.rst
index 62c9963..9c892a3 100644 (file)
--- a/docs/release/installation/requirements.rst
+++ b/docs/release/installation/requirements.rst
@@ -15,7 +15,7 @@ The Jumphost requirements are outlined below:
 4.     minimum 1 networks and maximum 5 networks, multiple NIC and/or VLAN
        combinations are supported.  This is virtualized for a VM deployment.
 
-5.     The Danube Apex RPMs and their dependencies.
+5.     The Euphrates Apex RPMs and their dependencies.
 
 6.     16 GB of RAM for a bare metal deployment, 64 GB of RAM for a VM
        deployment.

diff --git a/docs/release/installation/virtualinstall.rst b/docs/release/installation/virtualinstall.rst
index 5da2ee3..61fc4be 100644 (file)
--- a/docs/release/installation/virtualinstall.rst
+++ b/docs/release/installation/virtualinstall.rst
@@ -8,7 +8,7 @@ undercloud VM. In addition to the undercloud VM a collection of VMs
 or more compute nodes for a non-HA Deployment) will be defined for the target
 OPNFV deployment.  The part of the toolchain that executes IPMI power
 instructions calls into libvirt instead of the IPMI interfaces on baremetal
-servers to operate the power managment.  These VMs are then provisioned with
+servers to operate the power management.  These VMs are then provisioned with
 the same disk images and configuration that baremetal would be. To Triple-O
 these nodes look like they have just built and registered the same way as bare
 metal nodes, the main difference is the use of a libvirt driver for the power
@@ -22,6 +22,25 @@ Installation Guide - Virtual Deployment
 This section goes step-by-step on how to correctly install and provision the
 OPNFV target system to VM nodes.
 
+Special Requirements for Virtual Deployments
+--------------------------------------------
+
+In scenarios where advanced performance options or features are used, such
+as using huge pages with nova instances, DPDK, or iommu; it is required to
+enabled nested KVM support.  This allows hardware extensions to be passed to
+the overcloud VMs, which will allow the overcloud compute nodes to bring up
+KVM guest nova instances, rather than QEMU.  This also provides a great
+performance increase even in non-required scenarios and is recommended to be
+enabled.
+
+During deployment the Apex installer will detect if nested KVM is enabled,
+and if not, it will attempt to enable it; while printing a warning message
+if it cannot.  Check to make sure before deployment that Nested
+Virtualization is enabled in BIOS, and that the output of ``cat
+/sys/module/kvm_intel/parameters/nested`` returns "Y".  Also verify using
+``lsmod`` that the kvm_intel module is loaded for x86_64 machines, and
+kvm_amd is loaded for AMD64 machines.
+
 Install Jumphost
 ----------------
 
@@ -32,7 +51,7 @@ Running ``opnfv-deploy``
 
 You are now ready to deploy OPNFV!
 ``opnfv-deploy`` has virtual deployment capability that includes all of
-the configuration nessesary to deploy OPNFV with no modifications.
+the configuration necessary to deploy OPNFV with no modifications.
 
 If no modifications are made to the included configurations the target
 environment will deploy with the following architecture:

diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 9bb5155..5a292e3 100644 (file)
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -215,6 +215,9 @@ Bug Corrections
 | JIRA: APEX-406                       | ODL FDIO neutron patches to all      |
 |                                      | scenarios                            |
 +--------------------------------------+--------------------------------------+
+| JIRA: APEX-407                       | VPP service does not start upon      |
+|                                      | reboot                               |
++--------------------------------------+--------------------------------------+
 | JIRA: APEX-408                       | Quagga's bgpd cannot start due to    |
 |                                      | permissions                          |
 +--------------------------------------+--------------------------------------+

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index c6a97f2..88aced5 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -190,7 +190,7 @@ EOI
 EOI
     fi
 
-    # Configure routing node for odl_l3-fdio
+    # Configure routing node for odl-fdio
     if [[ "${deploy_options_array['sdn_l3']}" == 'True' ]]; then
       ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
         sed -i "/opendaylight::vpp_routing_node:/c\    opendaylight::vpp_routing_node: ${deploy_options_array['odl_vpp_routing_node']}.${domain_name}" ${ENV_FILE}

diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh
index 2a370bf..7108dcf 100755 (executable)
--- a/lib/undercloud-functions.sh
+++ b/lib/undercloud-functions.sh
@@ -55,6 +55,10 @@ function setup_undercloud_vm {
 
   # if the VM is not running update the authkeys and start it
   if ! virsh list | grep undercloud > /dev/null; then
+    if [ "$debug" == 'TRUE' ]; then
+      LIBGUESTFS_BACKEND=direct virt-customize -a $undercloud_dst --root-password password:opnfvapex
+    fi
+
     echo "Injecting ssh key to Undercloud VM"
     LIBGUESTFS_BACKEND=direct virt-customize -a $undercloud_dst --run-command "mkdir -p /root/.ssh/" \
         --upload ~/.ssh/id_rsa.pub:/root/.ssh/authorized_keys \

diff --git a/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py
index 48c55d7..5765c1c 100644 (file)
--- a/tests/test_apex_deploy_settings.py
+++ b/tests/test_apex_deploy_settings.py
@@ -24,11 +24,11 @@ deploy_files = ('deploy_settings.yaml',
                 'os-ocl-nofeature-ha.yaml',
                 'os-odl-bgpvpn-ha.yaml',
                 'os-odl-bgpvpn-noha.yaml',
-                'os-odl_l3-nofeature-ha.yaml',
+                'os-odl-nofeature-ha.yaml',
                 'os-nosdn-nofeature-ha.yaml',
                 'os-nosdn-ovs-ha.yaml',
                 'os-nosdn-performance-ha.yaml',
-                'os-odl_l2-nofeature-ha.yaml',
+                'os-odl-nofeature-ha.yaml',
                 'os-odl_l2-sfc-noha.yaml',
                 'os-onos-nofeature-ha.yaml',
                 'os-onos-sfc-ha.yaml')