summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-03-29 12:32:45 -0400
committerDan Radez <dradez@redhat.com>2017-03-30 08:08:10 -0400
commit6afb7794346307c9f276b49796c43e99c4fba604 (patch)
treec5658529b762814c816cfb3087b7c7babee3ece8
parenta684f6b753749c355aee06412bd0f22779357089 (diff)
Euphrates Docs update w odl scenario name cleanups
- updating docs to reference Euphrates - removing the odl_l2-nofeature scenario, it's obsolete - renameing odl_l3 to odl, it's default for odl now - adding symlinks to files to _l3 files so CI doesn't break will remote those once CI is updated to use new names Change-Id: I9f2646fc5dac443042c5f4be8cca7d2df5dca663 Signed-off-by: Dan Radez <dradez@redhat.com>
-rw-r--r--build/opnfv-environment.yaml2
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec29
-rw-r--r--config/deploy/deploy_settings.yaml2
-rw-r--r--config/deploy/os-odl-csit-noha.yaml12
-rw-r--r--config/deploy/os-odl-fdio-ha.yaml37
-rw-r--r--config/deploy/os-odl-fdio-noha.yaml37
-rw-r--r--config/deploy/os-odl-nofeature-ha.yaml11
-rw-r--r--config/deploy/os-odl-nofeature-noha.yaml11
-rw-r--r--config/deploy/os-odl-ovs-ha.yaml27
-rw-r--r--config/deploy/os-odl-ovs-noha.yaml27
l---------config/deploy/os-odl_l2-nofeature-ha.yaml1
l---------[-rw-r--r--]config/deploy/os-odl_l3-csit-noha.yaml13
l---------[-rw-r--r--]config/deploy/os-odl_l3-fdio-ha.yaml38
l---------[-rw-r--r--]config/deploy/os-odl_l3-fdio-noha.yaml38
l---------[-rw-r--r--]config/deploy/os-odl_l3-nofeature-ha.yaml12
l---------[-rw-r--r--]config/deploy/os-odl_l3-nofeature-noha.yaml12
l---------[-rw-r--r--]config/deploy/os-odl_l3-ovs-ha.yaml28
l---------[-rw-r--r--]config/deploy/os-odl_l3-ovs-noha.yaml28
-rw-r--r--contrib/simple_deploy.sh2
-rw-r--r--docs/release/installation/abstract.rst6
-rw-r--r--docs/release/installation/baremetal.rst2
-rw-r--r--docs/release/installation/index.rst2
-rw-r--r--docs/release/installation/introduction.rst4
-rw-r--r--docs/release/installation/requirements.rst2
-rwxr-xr-xlib/overcloud-deploy-functions.sh2
-rw-r--r--tests/test_apex_deploy_settings.py4
26 files changed, 198 insertions, 191 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 0018aa9..aab72bc 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -29,7 +29,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/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index c1bf296..d063ba6 100644
--- 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/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index c92a175..aedd197 100644
--- 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
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
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
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
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
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
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
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
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
index ad61e26..06ddcde 100644..120000
--- a/config/deploy/os-odl_l3-csit-noha.yaml
+++ b/config/deploy/os-odl_l3-csit-noha.yaml
@@ -1,12 +1 @@
-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
+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
index af81e5a..42bed3d 100644..120000
--- a/config/deploy/os-odl_l3-fdio-ha.yaml
+++ b/config/deploy/os-odl_l3-fdio-ha.yaml
@@ -1,37 +1 @@
-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
+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
index adb37f3..d8b983e 100644..120000
--- a/config/deploy/os-odl_l3-fdio-noha.yaml
+++ b/config/deploy/os-odl_l3-fdio-noha.yaml
@@ -1,37 +1 @@
-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
+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
index d421c7c..0334fae 100644..120000
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -1,11 +1 @@
-global_params:
- ha_enabled: true
-
-deploy_options:
- sdn_controller: opendaylight
- odl_version: boron
- sdn_l3: true
- tacker: true
- congress: true
- sfc: false
- vpn: false
+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
index 972b1f8..6222052 100644..120000
--- a/config/deploy/os-odl_l3-nofeature-noha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-noha.yaml
@@ -1,11 +1 @@
-global_params:
- ha_enabled: false
-
-deploy_options:
- sdn_controller: opendaylight
- odl_version: boron
- sdn_l3: true
- tacker: true
- congress: true
- sfc: false
- vpn: false
+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
index ad26569..fc68a75 100644..120000
--- a/config/deploy/os-odl_l3-ovs-ha.yaml
+++ b/config/deploy/os-odl_l3-ovs-ha.yaml
@@ -1,27 +1 @@
-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
+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
index 6f7630d..9301ced 100644..120000
--- a/config/deploy/os-odl_l3-ovs-noha.yaml
+++ b/config/deploy/os-odl_l3-ovs-noha.yaml
@@ -1,27 +1 @@
-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
+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
--- 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
--- 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/baremetal.rst b/docs/release/installation/baremetal.rst
index 83cda32..f06de9f 100644
--- a/docs/release/installation/baremetal.rst
+++ b/docs/release/installation/baremetal.rst
@@ -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:
diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst
index 615aa7e..9ac4c22 100644
--- 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
--- 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
--- 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/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index e7abdd0..77b061b 100755
--- 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/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py
index 48c55d7..5765c1c 100644
--- 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')