summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INFO16
-rw-r--r--config/installers/fuel/pod_config.yml.j238
-rwxr-xr-xconfig/utils/generate_config.py10
-rw-r--r--labs/intel/pod18.yaml294
4 files changed, 337 insertions, 21 deletions
diff --git a/INFO b/INFO
index 162e88df..54ff322a 100644
--- a/INFO
+++ b/INFO
@@ -12,14 +12,14 @@ Repository: pharos
Committers:
-trevor.cooper@intel.com
-fuqiao@chinamobile.com
-Wenjing.Chu@huawei.com
-morgan.richomme@orange.com
-jack.morgan@intel.com
-jose.lausuch@ericsson.com
-fatih.degirmenci@ericsson.com
-zhang.jun3g@zte.com.cn
+
+Fatih Degirmenci <fatih.degirmenci@ericsson.com>
+Jack Morgan <jack.morgan@intel.com>
+Jose Lausuch <jalausuch@suse.com>
+Julien Zhang <zhang.jun3g@zte.com.cn>
+Morgan Richomme <morgan.richomme@orange.com>
+Trevor Cooper <trevor.cooper@intel.com>
+Wenjing Chu <wenjing.chu@huawei.com>
Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/
Link(s) to approval of additional committers:
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index c2f14035..28c61888 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -8,6 +8,10 @@
{%- if conf.net_config.public.dns is defined -%}
{%- set dns_public = conf['net_config']['public']['dns'] -%}
{%- endif -%}
+ {%- set pxe_interface = conf['net_config']['admin']['interface'] -%}
+ {%- if conf.net_config.public.gateway is defined -%}
+ {%- set net_public_gw = conf['net_config']['public']['gateway'] -%}
+ {%- endif -%}
{%- else -%}
{%- set net_admin = '192.168.11.0' -%}
{%- set net_mgmt = '172.16.10.0' -%}
@@ -15,28 +19,39 @@
{%- set net_public = '172.30.10.0' -%}
{%- set vlan_mgmt = '300' -%}
{%- set vlan_private = '1000' -%}
+ {%- set pxe_interface = 0 -%}
{%- endif -%}
{%- if dns_public is not defined -%}
{%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
{%- endif -%}
-
-{%- set pxe_interface = 0 -%}
+{%- if net_public_gw is not defined -%}
+ {%- set net_public_gw = net_public | ipaddr_index('1') -%}
+{%- endif -%}
---
parameters:
_param:
+{%- if conf.idf is defined %}
+ opnfv_jump_bridge_admin: {{ conf['idf']['fuel']['jumphost']['bridges']['admin'] }}
+ opnfv_jump_bridge_mgmt: {{ conf['idf']['fuel']['jumphost']['bridges']['mgmt'] }}
+ opnfv_jump_bridge_private: {{ conf['idf']['fuel']['jumphost']['bridges']['private'] }}
+ opnfv_jump_bridge_public: {{ conf['idf']['fuel']['jumphost']['bridges']['public'] }}
+{%- endif %}
+
opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }}
opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }}
opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }}
- opnfv_infra_compute_node01_address: {{ net_mgmt | ipaddr_index('141') }}
- opnfv_infra_compute_node02_address: {{ net_mgmt | ipaddr_index('142') }}
- opnfv_infra_compute_node03_address: {{ net_mgmt | ipaddr_index('143') }}
opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }}
opnfv_infra_kvm_node01_address: {{ net_mgmt | ipaddr_index('141') }}
opnfv_infra_kvm_node02_address: {{ net_mgmt | ipaddr_index('142') }}
opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }}
+ opnfv_infra_maas_pxe_network_address: {{ net_admin }}
+ opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index('3') }}
+ opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('5') }}
+ opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('250') }}
+
opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }}
opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }}
opnfv_openstack_gateway_node03_address: {{ net_mgmt | ipaddr_index('126') }}
@@ -46,6 +61,8 @@ parameters:
opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }}
opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }}
opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }}
+ opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }}
+ opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('105') }}
opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }}
opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index('11') }}
opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index('12') }}
@@ -76,6 +93,7 @@ parameters:
opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }}
+ opnfv_net_public_gw: {{ net_public_gw }}
opnfv_name_servers: {{ dns_public }}
opnfv_dns_server01: '{{ dns_public[0] }}'
@@ -83,35 +101,35 @@ parameters:
opnfv_net_tenant_vlan: {{ vlan_private }}
opnfv_maas_node01_architecture: '{{ conf['nodes'][0]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'] }}
+ opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'].rsplit('/')[0]}}
opnfv_maas_node01_power_type: {{ conf['nodes'][0]['remote_management']['type'] }}
opnfv_maas_node01_power_user: {{ conf['nodes'][0]['remote_management']['user'] }}
opnfv_maas_node01_power_password: {{ conf['nodes'][0]['remote_management']['pass'] }}
opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][pxe_interface]['mac_address'] }}'
opnfv_maas_node02_architecture: '{{ conf['nodes'][1]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'] }}
+ opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'].rsplit('/')[0] }}
opnfv_maas_node02_power_type: {{ conf['nodes'][1]['remote_management']['type'] }}
opnfv_maas_node02_power_user: {{ conf['nodes'][1]['remote_management']['user'] }}
opnfv_maas_node02_power_password: {{ conf['nodes'][1]['remote_management']['pass'] }}
opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][pxe_interface]['mac_address'] }}'
opnfv_maas_node03_architecture: '{{ conf['nodes'][2]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'] }}
+ opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'].rsplit('/')[0] }}
opnfv_maas_node03_power_type: {{ conf['nodes'][2]['remote_management']['type'] }}
opnfv_maas_node03_power_user: {{ conf['nodes'][2]['remote_management']['user'] }}
opnfv_maas_node03_power_password: {{ conf['nodes'][2]['remote_management']['pass'] }}
opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][pxe_interface]['mac_address'] }}'
opnfv_maas_node04_architecture: '{{ conf['nodes'][3]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'] }}
+ opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'].rsplit('/')[0] }}
opnfv_maas_node04_power_type: {{ conf['nodes'][3]['remote_management']['type'] }}
opnfv_maas_node04_power_user: {{ conf['nodes'][3]['remote_management']['user'] }}
opnfv_maas_node04_power_password: {{ conf['nodes'][3]['remote_management']['pass'] }}
opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][pxe_interface]['mac_address'] }}'
opnfv_maas_node05_architecture: '{{ conf['nodes'][4]['node']['arch'] | dpkg_arch }}/generic'
- opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'] }}
+ opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'].rsplit('/')[0] }}
opnfv_maas_node05_power_type: {{ conf['nodes'][4]['remote_management']['type'] }}
opnfv_maas_node05_power_user: {{ conf['nodes'][4]['remote_management']['user'] }}
opnfv_maas_node05_power_password: {{ conf['nodes'][4]['remote_management']['pass'] }}
diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py
index ba4192cb..37108808 100755
--- a/config/utils/generate_config.py
+++ b/config/utils/generate_config.py
@@ -57,9 +57,13 @@ ENV.filters['dpkg_arch'] = dpkg_arch
try:
DICT = yaml.safe_load(check_output(['eyaml', 'decrypt', '-f', ARGS.yaml]))
except CalledProcessError as ex:
- pass
-if not DICT:
- logging.warn('PDF decryption failed, fallback to using raw data.')
+ logging.error('eyaml decryption failed, keys might be missing')
+except OSError as ex:
+ logging.warn('eyaml not found, skipping decryption')
+try:
+ DICT
+except NameError as ex:
+ logging.warn('PDF decryption skipped, fallback to using raw data.')
with open(ARGS.yaml) as _:
DICT = yaml.safe_load(_)
diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml
new file mode 100644
index 00000000..cc956976
--- /dev/null
+++ b/labs/intel/pod18.yaml
@@ -0,0 +1,294 @@
+---
+
+### POD descriptor file ###
+
+details:
+ pod_owner: Jack Morgan
+ contact: jack.morgan@intel.com
+ lab: Intel Pharos Lab
+ location: Portland, Oregon, USA
+ type: {production|development}
+ link: http://wiki.opnfv.org/display/pharos/Intel+Hosting
+
+jumphost:
+ name: pod18-jump
+ node:
+ type: baremetal
+ vendor: Intel
+ model: S2600WT
+ arch: x86_64
+ cpus: 2
+ cpu_cflags: broadwell
+ cores: 88
+ memory: 128G
+ disks:
+ - name: 'disk1'
+ disk_capacity: 480GB
+ disk_type: ssd
+ disk_interface: ssd
+ disk_rotation:
+ - name: 'disk2'
+ disk_capacity: 1TB
+ disk_type: hdd
+ disk_interface: sas
+ disk_rotation: 15000
+ os: centos-7.2.1611
+ remote_params: &remoteparas
+ type: ipmi
+ versions:
+ - 1.0
+ - 2.0
+ user:
+ pass:
+ remote_management:
+ <<: *remoteparas
+ address: 10.10.180.10
+ mac_address: "A4:BF:01:16:31:98"
+ interfaces:
+ - nic: 'nic1'
+ address: 10.10.180.20/24
+ mac_address: "A4:BF:01:16:31:96"
+ vlan: native
+ - nic: 'nic2'
+ address: 10.10.181.20/24
+ mac_address: "A4:BF:01:16:31:97"
+ vlan: native
+nodes:
+ - name: pod18-node1
+ node: &nodeparas
+ type: baremetal
+ vendor: Intel
+ model: S2600WT
+ arch: x86_64
+ cpus: 2
+ cpu_cflags: broadwell
+ cores: 88
+ memory: 128G
+ disks: &disks
+ - name: 'disk1'
+ disk_capacity: 480GB
+ disk_type: ssd
+ disk_interface: ssd
+ disk_rotation:
+ - name: 'disk2'
+ disk_capacity: 1TB
+ disk_type: hdd
+ disk_interface: sas
+ disk_rotation: 15000
+ remote_management:
+ <<: *remoteparas
+ address: 10.10.180.11/24
+ mac_address: "A4:BF:01:14:40:18"
+ interfaces:
+ - name: 'nic1'
+ speed: 1gb
+ features:
+ address: 10.10.180.21/24
+ mac_address: "A4:BF:01:14:40:16"
+ vlan: native
+ - name: 'nic2'
+ speed: 1gb
+ features:
+ address: 10.10.181.21/24
+ mac_address: "A4:BF:01:14:40:17"
+ vlan: native
+ - name: 'nic3'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.182.21/24
+ mac_address: "3C:FD:FE:A4:9F:A0"
+ vlan: native
+ - name: 'nic4'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.183.21/24
+ mac_address: "3C:FD:FE:A4:9F:A1"
+ vlan: native
+ - name: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.184.21/24
+ mac_address: "3C:FD:FE:A4:9F:A2"
+ vlan: native
+ - name: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.185.21/24
+ mac_address: "3C:FD:FE:A4:9F:A3"
+ vlan: native
+ - name: pod18-node2
+ node: *nodeparas
+ disks: *disks
+ remote_management:
+ <<: *remoteparas
+ address: 10.10.180.12/24
+ mac_address: "A4:BF:01:16:31:1G"
+ interfaces:
+ - name: 'nic1'
+ speed: 1gb
+ features:
+ address: 10.10.180.22/24
+ mac_address: "A4:BF:01:16:31:1E"
+ vlan: native
+ - name: 'nic2'
+ speed: 1gb
+ features:
+ address: 10.10.181.22/24
+ mac_address: "A4:BF:01:16:31:1F"
+ vlan: native
+ - name: 'nic3'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.182.22/24
+ mac_address: "3C:FD:FE:A4:A0:30"
+ vlan: native
+ - name: 'nic4'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.183.22/24
+ mac_address: "3C:FD:FE:A4:A0:31"
+ vlan: native
+ - name: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.184.22/24
+ mac_address: "3C:FD:FE:A4:A0:32"
+ vlan: native
+ - name: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.185.22/24
+ mac_address: "3C:FD:FE:A4:A0:33"
+ vlan: native
+ - name: pod18-node3
+ node: *nodeparas
+ disks: *disks
+ remote_management:
+ <<: *remoteparas
+ address: 10.10.180.13/24
+ mac_address: "A4:BF:01:16:30:F8"
+ interfaces:
+ - name: 'nic1'
+ speed: 1gb
+ features:
+ address: 10.10.180.23/24
+ mac_address: "A4:BF:01:16:30:F6"
+ vlan: native
+ - name: 'nic2'
+ speed: 1gb
+ features:
+ address: 10.10.181.23/24
+ mac_address: "A4:BF:01:16:30:F7"
+ vlan: native
+ - name: 'nic3'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.182.23/24
+ mac_address: "3C:FD:FE:A4:9E:48"
+ vlan: native
+ - name: 'nic4'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.183.23/24
+ mac_address: "3C:FD:FE:A4:9E:49"
+ vlan: native
+ - name: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.184.23/24
+ mac_address: "3C:FD:FE:A4:9E:4A"
+ vlan: native
+ - name: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.185.23/24
+ mac_address: "3C:FD:FE:A4:9E:4B"
+ vlan: native
+ - name: pod18-node4
+ node: *nodeparas
+ disks: *disks
+ remote_management:
+ <<: *remoteparas
+ address: 10.10.180.14/24
+ mac_address: "A4:BF:01:14:72:0F"
+ interfaces:
+ - name: 'nic1'
+ speed: 1gb
+ features:
+ address: 10.10.180.24/24
+ mac_address: "A4:BF:01:14:72:0D"
+ vlan: native
+ - name: 'nic2'
+ speed: 1gb
+ features:
+ address: 10.10.181.24/24
+ mac_address: "A4:BF:01:14:72:0E"
+ vlan: native
+ - name: 'nic3'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.182.24/24
+ mac_address: "3C:FD:FE:A4:9D:E8"
+ vlan: native
+ - name: 'nic4'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.183.24/24
+ mac_address: "3C:FD:FE:A4:9D:E9"
+ vlan: native
+ - name: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.184.24/24
+ mac_address: "3C:FD:FE:A4:9D:EA"
+ vlan: native
+ - name: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.185.24/24
+ mac_address: "3C:FD:FE:A4:9D:EB"
+ vlan: native
+ - name: pod18-node5
+ node: *nodeparas
+ disks: *disks
+ remote_management:
+ <<: *remoteparas
+ address: 10.10.180.15/24
+ mac_address: "A4:BF:01:14:71:70"
+ interfaces:
+ - name: 'nic1'
+ speed: 1gb
+ features:
+ address: 10.10.180.25/24
+ mac_address: "A4:BF:01:14:71:68"
+ vlan: native
+ - name: 'nic2'
+ speed: 1gb
+ features:
+ address: 10.10.181.25/24
+ mac_address: "A4:BF:01:14:71:69"
+ vlan: native
+ - name: 'nic3'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.182.25/24
+ mac_address: "3C:FD:FE:A4:A1:08"
+ vlan: native
+ - name: 'nic4'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.183.25/24
+ mac_address: "3C:FD:FE:A4:A1:09"
+ vlan: native
+ - name: 'nic5'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.184.25/24
+ mac_address: "3C:FD:FE:A4:A1:0A"
+ vlan: native
+ - name: 'nic6'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 10.10.185.25/24
+ mac_address: "3C:FD:FE:A4:A1:0B"
+ vlan: native