diff options
| -rw-r--r-- | build/nics/compute.yaml | 2 | ||||
| -rw-r--r-- | build/nics/compute_br-ex.yaml | 2 | ||||
| -rw-r--r-- | build/nics/compute_br-ex_no-public-ip.yaml | 2 | ||||
| -rw-r--r-- | build/nics/controller.yaml | 2 | ||||
| -rw-r--r-- | build/opnfv-apex-common.spec | 2 | ||||
| -rw-r--r-- | docs/installation-instructions/baremetal.rst | 3 |
6 files changed, 8 insertions, 5 deletions
diff --git a/build/nics/compute.yaml b/build/nics/compute.yaml index 6978e9e3..d8958613 100644 --- a/build/nics/compute.yaml +++ b/build/nics/compute.yaml @@ -86,7 +86,7 @@ resources: next_hop: {get_param: EC2MetadataIp} - type: interface - name: nic3 + name: nic2 use_dhcp: false addresses: - diff --git a/build/nics/compute_br-ex.yaml b/build/nics/compute_br-ex.yaml index d187a96c..c0361eae 100644 --- a/build/nics/compute_br-ex.yaml +++ b/build/nics/compute_br-ex.yaml @@ -98,7 +98,7 @@ resources: members: - type: interface - name: nic3 + name: nic2 # force the MAC address of the bridge to this interface primary: true diff --git a/build/nics/compute_br-ex_no-public-ip.yaml b/build/nics/compute_br-ex_no-public-ip.yaml index 30c23c4d..bf7ea851 100644 --- a/build/nics/compute_br-ex_no-public-ip.yaml +++ b/build/nics/compute_br-ex_no-public-ip.yaml @@ -91,7 +91,7 @@ resources: members: - type: interface - name: nic3 + name: nic2 # force the MAC address of the bridge to this interface primary: true diff --git a/build/nics/controller.yaml b/build/nics/controller.yaml index 336b34a1..1b421ac9 100644 --- a/build/nics/controller.yaml +++ b/build/nics/controller.yaml @@ -106,7 +106,7 @@ resources: members: - type: interface - name: nic3 + name: nic2 # force the MAC address of the bridge to this interface primary: true diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index e1675054..b195ddb2 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -11,6 +11,7 @@ Source0: opnfv-apex-common.tar.gz BuildArch: noarch BuildRequires: openvswitch qemu-kvm python-docutils Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools +Requires: initscripts net-tools iputils iproute iptables %description Scripts for OPNFV deployment using RDO Manager @@ -77,6 +78,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %changelog * Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 2.2-0 - Brahmaputra SR1 +- adding dependencies initscripts net-tools iputils iproute iptables * Wed Jan 27 2016 Tim Rozet <trozet@redhat.com> - 2.1-4 - Adds example inventory file and nosdn scenario * Wed Jan 20 2016 Dan Radez <dradez@redhat.com> - 2.1-3 diff --git a/docs/installation-instructions/baremetal.rst b/docs/installation-instructions/baremetal.rst index a4a05094..d8365d7f 100644 --- a/docs/installation-instructions/baremetal.rst +++ b/docs/installation-instructions/baremetal.rst @@ -123,7 +123,8 @@ Creating a Node Inventory File IPMI configuration information gathered in section `Execution Requirements (Bare Metal Only)`_ needs to be added to the ``inventory.yaml`` file. -1. Edit ``/etc/opnfv-apex/inventory.yaml``. +1. Copy ``/usr/share/doc/opnfv/inventory.yaml.example`` as your inventory file template to + ``/etc/opnfv-apex/inventory.yaml``. 2. The nodes dictionary contains a definition block for each baremetal host that will be deployed. 1 or more compute nodes and 3 controller nodes are required. |