diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy/deploy_settings.yaml | 13 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-bgpvpn-noha.yaml (renamed from config/deploy/os-odl_l2-sdnvpn-ha.yaml) | 4 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-ha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-noha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl_l3-csit-noha.yaml | 12 | ||||
| -rw-r--r-- | config/inventory/pod_example_settings.yaml | 5 | ||||
| -rw-r--r-- | config/network/network_settings.yaml | 10 | ||||
| -rw-r--r-- | config/network/network_settings_v6.yaml | 8 | ||||
| -rw-r--r-- | config/network/network_settings_vlans.yaml | 12 | ||||
| -rw-r--r-- | config/yum.repos.d/opnfv-apex.repo | 6 |
10 files changed, 55 insertions, 19 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml index e7821f18..ea35ae70 100644 --- a/config/deploy/deploy_settings.yaml +++ b/config/deploy/deploy_settings.yaml @@ -14,9 +14,9 @@ deploy_options: sdn_controller: opendaylight # Which version of ODL to use. This is only valid if 'opendaylight' was used - # above. If 'Boron' is specified, ODL Boron will be used. If no value is specified, - # Lithium will be used. - #odl_version: Boron + # above. Valid options are 'beryllium', 'boron' and 'carbon'. If no value + # is specified, Beryllium will be used. + #odl_version: boron # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent and # use ODL instead. @@ -48,6 +48,13 @@ deploy_options: # Whether to run vsperf after the install has completed #vsperf: false + # Specify a device for ceph to use for the OSDs. By default a virtual disk + # is created for the OSDs. This setting allows you to specify a different + # target for the OSDs. The setting must be valid on all overcloud nodes. + # The controllers and the compute nodes all have OSDs setup on them and + # therefore this device name must be valid on all overcloud nodes. + #ceph_device: /dev/sdb + # Set performance options on specific roles. The valid roles are 'Compute', 'Controller' # and 'Storage', and the valid sections are 'kernel' and 'nova' #performance: diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-noha.yaml index f6904f05..011c2b3d 100644 --- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml +++ b/config/deploy/os-odl_l2-bgpvpn-noha.yaml @@ -1,10 +1,10 @@ global_params: - ha_enabled: true + ha_enabled: false deploy_options: sdn_controller: opendaylight sdn_l3: false - tacker: true + tacker: false congress: true sfc: false vpn: true diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml index 82836573..d4a86b0f 100644 --- a/config/deploy/os-odl_l2-fdio-ha.yaml +++ b/config/deploy/os-odl_l2-fdio-ha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: sdn_controller: opendaylight sdn_l3: false - odl_version: boron + odl_version: carbon tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml index 53d6181a..b9e0cea6 100644 --- a/config/deploy/os-odl_l2-fdio-noha.yaml +++ b/config/deploy/os-odl_l2-fdio-noha.yaml @@ -4,7 +4,7 @@ global_params: deploy_options: sdn_controller: opendaylight sdn_l3: false - odl_version: boron + odl_version: carbon tacker: true congress: true sfc: false diff --git a/config/deploy/os-odl_l3-csit-noha.yaml b/config/deploy/os-odl_l3-csit-noha.yaml new file mode 100644 index 00000000..ad61e26b --- /dev/null +++ b/config/deploy/os-odl_l3-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/inventory/pod_example_settings.yaml b/config/inventory/pod_example_settings.yaml index 3e34abe9..c08b30c2 100644 --- a/config/inventory/pod_example_settings.yaml +++ b/config/inventory/pod_example_settings.yaml @@ -8,6 +8,7 @@ nodes: cpus: 2 memory: 8192 disk: 40 + disk_device: sdb arch: "x86_64" capabilities: "profile:control" node2: @@ -19,6 +20,7 @@ nodes: cpus: 2 memory: 8192 disk: 40 + disk_device: sdb arch: "x86_64" capabilities: "profile:control" node3: @@ -30,6 +32,7 @@ nodes: cpus: 2 memory: 8192 disk: 40 + disk_device: sdb arch: "x86_64" capabilities: "profile:control" node4: @@ -41,6 +44,7 @@ nodes: cpus: 2 memory: 8192 disk: 40 + disk_device: sdb arch: "x86_64" capabilities: "profile:compute" node5: @@ -52,5 +56,6 @@ nodes: cpus: 2 memory: 8192 disk: 40 + disk_device: sdb arch: "x86_64" capabilities: "profile:compute" diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml index 6cf9ae80..1cba64bb 100644 --- a/config/network/network_settings.yaml +++ b/config/network/network_settings.yaml @@ -66,7 +66,7 @@ networks: # Network configurations - em1 # Member Interface to bridge to for installer VM (use multiple values for bond) vlan: native # VLAN tag to use for this network on Installer VM, native means none ip: 192.0.2.1 # IP to assign to Installer VM on this network - usable_ip_range: + overcloud_ip_range: - 192.0.2.11 - 192.0.2.99 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be # used for host bridge (i.e. br-admin). If empty entire range is usable. @@ -121,7 +121,7 @@ networks: # Network configurations floating_ip_range: - 192.168.37.200 - 192.168.37.220 # Range to allocate to floating IPs for the public network with Neutron - usable_ip_range: + overcloud_ip_range: - 192.168.37.10 - 192.168.37.199 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be used for host # bridge (i.e. br-public). If empty entire range is usable. Cannot overlap with dhcp_range or introspection_range. @@ -154,7 +154,7 @@ networks: # Network configurations floating_ip_range: - 192.168.38.200 - 192.168.38.220 # Range to allocate to floating IPs for the public network with Neutron - usable_ip_range: + overcloud_ip_range: - 192.168.38.10 - 192.168.38.199 # Usable IP range for overcloud nodes (including VIPs), usually this is a shared subnet. # Cannot overlap with dhcp_range or introspection_range. @@ -214,4 +214,6 @@ apex: admin: introspection_range: - 192.0.2.100 - - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range. + - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range. + # If the external network 'public' is disabled, then this range will be re-used to configure the floating ip range + # for the overcloud default external network diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml index b12614f1..54c4113f 100644 --- a/config/network/network_settings_v6.yaml +++ b/config/network/network_settings_v6.yaml @@ -66,7 +66,7 @@ networks: # Network configurations - em1 # Member Interface to bridge to for installer VM (use multiple values for bond) vlan: native # VLAN tag to use for this network on Installer VM, native means none ip: 192.0.2.1 # IP to assign to Installer VM on this network - usable_ip_range: + overcloud_ip_range: - 192.0.2.11 - 192.0.2.99 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be # used for host bridge (i.e. br-admin). @@ -76,7 +76,7 @@ networks: # Network configurations dhcp_range: - 192.0.2.2 - 192.0.2.10 # DHCP range for the admin network, if empty it will be automatically provisioned. - # Cannot overlap with usable_ip_range or introspection_range. + # Cannot overlap with overcloud_ip_range or introspection_range. nic_mapping: # Mapping of network configuration for Overcloud Nodes compute: # Mapping for compute profile (nodes that will be used as Compute nodes) phys_type: interface # Physical interface type (interface or bond) @@ -177,4 +177,6 @@ apex: admin: introspection_range: - 192.0.2.100 - - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range. + - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range. + # If the external network 'public' is disabled, then this range will be re-used to configure the floating ip range + # for the overcloud default external network diff --git a/config/network/network_settings_vlans.yaml b/config/network/network_settings_vlans.yaml index c5143641..d892289f 100644 --- a/config/network/network_settings_vlans.yaml +++ b/config/network/network_settings_vlans.yaml @@ -66,7 +66,7 @@ networks: # Network configurations - em1 # Member Interface to bridge to for installer VM (use multiple values for bond) vlan: native # VLAN tag to use for this network on Installer VM, native means none ip: 192.0.2.1 # IP to assign to Installer VM on this network - usable_ip_range: + overcloud_ip_range: - 192.0.2.11 - 192.0.2.99 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be # used for host bridge (i.e. br-admin). If empty entire range is usable. @@ -76,7 +76,7 @@ networks: # Network configurations dhcp_range: - 192.0.2.2 - 192.0.2.10 # DHCP range for the admin network, if empty it will be automatically provisioned. - # Cannot overlap with usable_ip_range or introspection_range. + # Cannot overlap with overcloud_ip_range or introspection_range. nic_mapping: # Mapping of network configuration for Overcloud Nodes compute: # Mapping for compute profile (nodes that will be used as Compute nodes) phys_type: interface # Physical interface type (interface or bond) @@ -122,7 +122,7 @@ networks: # Network configurations floating_ip_range: - 192.168.37.200 - 192.168.37.220 # Range to allocate to floating IPs for the public network with Neutron - usable_ip_range: + overcloud_ip_range: - 192.168.37.10 - 192.168.37.199 # Usable IP range on the public network, usually this is a shared subnet nic_mapping: # Mapping of network configuration for Overcloud Nodes @@ -154,7 +154,7 @@ networks: # Network configurations floating_ip_range: - 192.168.38.200 - 192.168.38.220 # Range to allocate to floating IPs for the public network with Neutron - usable_ip_range: + overcloud_ip_range: - 192.168.38.10 - 192.168.38.199 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be used for host # bridge (i.e. br-public). If empty entire range is usable. @@ -214,4 +214,6 @@ apex: admin: introspection_range: - 192.0.2.100 - - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range. + - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range. + # If the external network 'public' is disabled, then this range will be re-used to configure the floating ip range + # for the overcloud default external network diff --git a/config/yum.repos.d/opnfv-apex.repo b/config/yum.repos.d/opnfv-apex.repo new file mode 100644 index 00000000..aff09420 --- /dev/null +++ b/config/yum.repos.d/opnfv-apex.repo @@ -0,0 +1,6 @@ +[opnfv-apex] +name=OPNFV Apex Danube +baseurl=http://artifacts.opnfv.org/apex/danube/yumrepo/ +failovermethod=priority +enabled=1 +gpgcheck=0 |