diff options
| -rw-r--r-- | config/network/network_settings.yaml | 1 | ||||
| -rw-r--r-- | docs/installationprocedure/baremetal.rst | 12 | ||||
| -rw-r--r-- | lib/python/apex/network_environment.py | 6 |
3 files changed, 14 insertions, 5 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index f7680643..5c9d644c 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -57,6 +57,7 @@ private_network: cidr: 11.0.0.0/24 compute_interface: nic2 controller_interface: nic2 + vlan_id_range: 1,1000 # Tenant physical network VLAN-ID range # "public" network is used for external connectivity. # The external network provides Internet access for virtual diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst index 21dc444e..1cf8f680 100644 --- a/docs/installationprocedure/baremetal.rst +++ b/docs/installationprocedure/baremetal.rst @@ -184,18 +184,20 @@ IPMI configuration information gathered in section - ``ipmi_user``: IPMI username - ``ipmi_password``: IPMI password - ``pm_type``: Power Management driver to use for the node + values: pxe_ipmitool (tested) or pxe_wol (untested) or pxe_amt (untested) - ``cpus``: (Introspected*) CPU cores available - ``memory``: (Introspected*) Memory available in Mib - ``disk``: (Introspected*) Disk space available in Gb - ``arch``: (Introspected*) System architecture - - ``capabilities``: (Opt**) Node role (profile:control or profile:compute) + - ``capabilities``: (Opt**) Node's role in deployment + values: profile:control or profile:compute -\* *Introspection looks up the overcloud node's resources and overrides these + \* Introspection looks up the overcloud node's resources and overrides these value. You can leave default values and Apex will get the correct values when - it runs introspection on the nodes.* + it runs introspection on the nodes. -** *If capabilities profile is not specified then Apex will select node's roles - in the OPNFV cluster in a non-deterministic fashion.* + ** If capabilities profile is not specified then Apex will select node's roles + in the OPNFV cluster in a non-deterministic fashion. Creating the Settings Files --------------------------- diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py index d96fa44e..61810d80 100644 --- a/lib/python/apex/network_environment.py +++ b/lib/python/apex/network_environment.py @@ -126,6 +126,12 @@ class NetworkEnvironment(dict): }] priv_cidr = net_settings[PRIVATE_NETWORK]['cidr'] self[param_def]['TenantNetCidr'] = str(priv_cidr) + if 'vlan_id_range' in net_settings[PRIVATE_NETWORK].keys(): + tenant_vlan_range = \ + net_settings[PRIVATE_NETWORK]['vlan_id_range'].split(',') + self[param_def]['NeutronNetworkVLANRanges'] = \ + "datacentre:" + tenant_vlan_range[0] + ':' \ + + tenant_vlan_range[1] if priv_cidr.version == 6: postfix = '/tenant_v6.yaml' else: |