From 5797983f51bea393307a0319bad438a798fcd054 Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Tue, 1 Jun 2021 19:02:24 +0530 Subject: PDF: Update PDF Template and Tool Update the PDF template and tool in includes the changes proposed in CNTT release. JIRA: CIRV-51 Signed-off-by: Sridhar K. N. Rao Change-Id: Icb99273711df0a077a1499788f7af171902cce94 --- sdv/pdf/site/index.html | 184 +++++- sdv/pdf/template/pdf_template.json | 1144 +++++++++++++++++++----------------- 2 files changed, 781 insertions(+), 547 deletions(-) diff --git a/sdv/pdf/site/index.html b/sdv/pdf/site/index.html index fe88f29..edc3750 100644 --- a/sdv/pdf/site/index.html +++ b/sdv/pdf/site/index.html @@ -87,10 +87,12 @@
  • Rack Information
  • Storage Cluster Information
  • BIOS Profiles
  • +
  • BMC Profiles
  • Processor Profiles
  • Disks Profiles
  • NIC Profiles
  • Hardware Profiles
  • +
  • Switch Profiles
  • Storage Profiles
  • Networks
  • Physical Networks
  • @@ -134,10 +136,18 @@ +
    + + +
    +
    + + +
    @@ -149,6 +159,18 @@

    User Information


    +
    + + +
    +
    + + +
    +
    + + +
    @@ -425,13 +447,17 @@
    +
    + + +
    - +
    @@ -473,15 +499,27 @@
    - +
    - +
    - + +
    +
    + + +
    +
    + + +
    +
    + +
    @@ -505,6 +543,14 @@ +
    + + +
    +
    + + +
    @@ -527,7 +573,7 @@
    - +
    @@ -547,6 +593,30 @@
    +
    + +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    @@ -561,6 +631,14 @@
    +
    + + +
    +
    + + +
    @@ -572,7 +650,7 @@

    BIOS Profiles


    -
    +
    @@ -592,7 +670,7 @@
    - +
    @@ -604,6 +682,31 @@
    +
    + Next +
    +
    +
    +
    +

    BMC Profiles

    +
    +
    +
    +
    + + +
    +
    + +
    + + +
    +
    +
    +
    +
    +
    @@ -793,12 +896,20 @@
    +
    + + +
    +
    + + +
    @@ -811,6 +922,10 @@
    +
    + + +
    @@ -832,6 +947,55 @@
    +
    + Next +
    +
    +
    +
    +

    Switch Profiles

    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    @@ -1175,7 +1339,7 @@

    Network-Interface Mapping


    -
    +
    @@ -1186,11 +1350,11 @@
    - +
    - +
    diff --git a/sdv/pdf/template/pdf_template.json b/sdv/pdf/template/pdf_template.json index 5dfada5..8778e10 100644 --- a/sdv/pdf/template/pdf_template.json +++ b/sdv/pdf/template/pdf_template.json @@ -1,537 +1,607 @@ -{ - "_comment_head":"Maintainer - Sridhar Rao ", - "_comment_head1":"User should Configure all profiles. Add new, if reqd.", - "_comment_head2":"User should Configure the roles", - "_comment_head3":"All infos should be filled by the user", - "_comment_head4":"The servers data will be automatically generated", - "_comment_info1":"All Infos", - "management_info": { - "owner":"", - "area_name": "", - "area_center_name": "", - "room_id": "", - "city": "", - "resource_pool_name": "" - }, - "user_info": [ - { - "username":"", - "password":"", - "pub_key":"", - "passphrase":"", - "tls_ca_cert":"", - "tls_cert":"", - "tls_key":"", - "email":"" - } - ], - "ntp_info": { - "primary_ip":"", - "primary_zone":"", - "secondary_ip":"", - "secondary_zone":"" - }, - "syslog_info": { - "server_ip":"", - "transport":"" - }, - "dns_info": [ - { - "name":"", - "domain":"", - "servers": [ - { - "ip": "" - } - ] - } - ], - "proxy_info": { - "address":"", - "port":"", - "user":"", - "password":"" - }, - "ldap_info": { - "base_url":"", - "url":"", - "auth_path":"", - "common_name":"", - "subdomain":"", - "domain":"" - }, - "vim_info": { - "vim_name": " ", - "vim_id": " ", - "vendor": " ", - "version": " ", - "installer":"", - "deployment_style":"", - "container_orchestrator":"", - "storage_type":"" - }, - "_comment_deployment":" Type can be OOK or NOOK, block storage method is rbd or iscsi", - "deployment_info": { - "high_availability":"", - "introspection":"", - "deployment_type":"", - "installer_used":"", - "workload_vnf":"", - "workload_cnf":"", - "sdn_controller":"", - "sdn_controller_version":"", - "sdn_controller_nbapps":"", - "vnfm":"", - "vnfm_version":"", - "data_plane_used":"", - "ironic_deploy_interface":"", - "external_storage_cluster":"", - "bl_str_connect_method":"" - }, - "vim_functional": { - "scheduler_filters":"", - "cpu_allocation_ratio":"" - }, - "jumphost_info": { - "ip":"", - "name":"" - }, - "rack_info": [ - { - "rack_id":"", - "rack_details": { - "rack_name":"", - "rack_description":"", - "rack_az":"" - } - } - ], - "storage_cluster_info": { - "name":"", - "cluster_type":"", - "cluster_id":"", - "auth_type":"", - "username":"", - "password":"", - "certificate_location":"", - "client_key":"", - "mon_host_ips": [ - { - "ips":"" - } - ], - "public_cidr":"", - "cluster_cidr":"", - "pools": [ - { - "key":"", - "value":"" - } - ] - }, - "_comment_info2": "End of Information - Except Software-INFO", - "bios_profile": [ - { - "profile_name":"", - "bios_info": - { - "bios_version": "", - "bios_mode":"", - "bootstrap_proto":"", - "hyperthreading_enabled":"", - "_comment":"C4_C6_MLC-STR_MLC-SPA_DCU_DCA_RAS_TURBO", - "bios_setting":"" - } - } - ], - "processor_profiles": [ - { - "profile_name":"", - "profile_info": - { - "manufacturer": "", - "generation":"", - "speed":"", - "model":"", - "architecture":"", - "cpu_cflags":"", - "cache_size":"", - "numas": [ - { - "node_id":"", - "cpu_set":"" - } - ] - } - } - ], - "disks_profiles": [ - { - "profile_name":"", - "profile_info": [ - { - "alias":"", - "vendor":"", - "address":"", - "size":"", - "model":"", - "dev_type":"", - "rotation":"", - "bus":"", - "logical_name":"" - } - ] - } - ], - "nic_profiles": [ - { - "profile_name":"", - "profile_info": [ - { - "alias":"", - "name":"", - "address":"", - "dev_type":"", - "bus":"", - "sriov_capable":"", - "numa_id":"" - } - ] - } - ], - "hardware_profiles": [ - { - "profile_name": "", - "profile_info": { - "manufacturer": "", - "model": "", - "generation":"", - "bios_profile":"", - "processor_profile": "", - "memory": "", - "disks_profile": "", - "nics_profile":"" - } - } - ], - "_comment_hw":" Hardware Information is complete", - "storage_profile": [ - { - "name":"", - "bootdrive":"", - "bd_partitions": [ - { - "name":"", - "size":"", - "bootable":"", - "filesystem": { - "mountpoint":"", - "fstype":"", - "mount_options":"" - } - } - ], - "data_devices": [ - { - "name":"", - "partitions": [ - { - "name":"ceph", - "size":"available", - "filesystem": { - "mountpoint":"/var/lib/ceph", - "fstype":"ext4", - "mount_options":"defaults" - } - } - ] - } - ], - "journal_devices": [ - { - "name":"" - } - ] - - } - ], - "_comment_nw1": "Network Info, Please include IPMI & Physnets info too", - "networks": [ - { - "name":"", - "vips":[ - { - "name":"", - "ip":"" - } - ], - "tunnel_type":"", - "tunnel_id":"", - "tunnel_id_range":"", - "mtu":"", - "routedomain":"", - "cidr":"", - "dns":"", - "routes": [ - { - "subnet":"", - "gateway":"", - "metric":"", - "routedomain":"" - } - ], - "allocation_pools": [ - { - "type":"", - "start":"", - "end":"" - } - ], - "v6_cidr":"", - "v6_allocation_pools": [ - { - "type":"", - "start":"", - "end":"" - } - ] - } - ], - "physical_networks": [ - { - "name":"external", - "cidr":"", - "type":"flat" - } - ], - "_comment_nw2":" type: trunk (airship), bond, interface, bridge", - "network_link": [ - { - "name":"", - "type":"", - "bonding_mode":"", - "mtu":"", - "linkspeed":"auto", - "trunking_mode":"", - "trunking_default_nw":"", - "metadata": [ - { - "key":"", - "value":"" - } - ], - "members":[ - { - "name":"", - "type":"" - } - ], - "vid":"", - "vf_count":"" - } - ], - "_comment_nw4": "The interface_name could be i/f, bond, bridges", - "_comment_nw5": "These profiles are mapped to roles", - "interface_mapping_profiles": [ - { - "profile_name":"", - "profile_data": [ - { - "interface_name":"", - "interface_type":"", - "networks": [ - { - "name":"" - } - ], - "use_dhcp":"" - } - ] - } - ], - "platform_profiles": [ - { - "profile_name":"", - "os":"", - "rt_kvm":"", - "kernel_version":"", - "kernel_parameters":"", - "isolated_cpus":"", - "vnf_cores":"", - "os_reserved_cores": " ", - "hugepage_count":"", - "hugepages": [ - { - "hugepage_count":"", - "hugepage_size":"" - } - ], - "iommu":"", - "vswitch_daemon_cores": " ", - "vswitch_type":"", - "vswitch_uio_driver":"", - "vswitch_mem_channels":"", - "vswitch_socket_memory":"", - "vswitch_pmd_cores":"", - "vswitch_dpdk_lcores":"", - "vswitch_dpdk_rxqs":"", - "vswitch_options":"" - } - ], - "undercloud_ook":{ - "dns": { - "cluster_domain":"", - "service_ip":"" - }, - "etcd":{ - "service_ip":"", - "container_port":"", - "haproxy_port":"" - }, - "masters": [ - { - "hostname":"" - } - ], - "networking":{ - "type":"", - "interface_used":"", - "api_service_ip":"", - "etcd_service_ip":"", - "pod_cidr":"", - "service_cidr":"", - "apiserver_port":"", - "haproxy_port":"", - "servicenode_port_range":"" - }, - "kvps":[ - { - "key":"", - "value":"" - } - ] - - }, - "undercloud_ooo":{ - "host_name":"", - "local_ip":"", - "public_host":"", - "admin_host":"", - "local_interface":"", - "inspection_interface":"", - "networking":{ - "ctrlplane_cidr":"", - "ctrlplane_ip_start":"", - "ctrlplane_ip_end":"", - "inspection_range":"", - "gateway":"" - } - }, - "_comment_sw1":"Software Begins", - "undercloud_sw_profiles":[ - { - "profile_name":"", - "sw_list": [ - { - "name":"", - "version":"" - } - ] - } - ], - "openstack_sw_profiles":[ - { - "profile_name":"", - "sw_list": [ - { - "name":"", - "version":"" - } - ] - } - ], - "infra_sw_profiles":[ - { - "profile_name":"", - "sw_list": [ - { - "name":"", - "version":"" - } - ] - } - ], - "software_set": [ - { - "set_name":"", - "undercloud_profile":"", - "infrasw_profile":"", - "openstack_profile":"" - } - ], - "_comment_role1":"User has to configure this - What profile to use for a role", - "_comment_role2":"Based on this server_info will be autogenerated for all servers", - "roles": [ - { - "name":"", - "hostname_prefix":"", - "hostname_suffix":"", - "hostname_number_start":"", - "count":"", - "hardware_profile":"", - "interface_mapping":"", - "storage_mapping":"", - "platform_profile":"", - "sw_set_name":"", - "metadata": [ - { - "on_count_condition":"", - "count":"", - "key":"", - "value":"" - } - ] - } - ], - "_comment_ex1":"C:City, A:Area, R:Room, N:Unique Number", - "_comment_ex2":"All are 2 characters. City-Capitals, Area-Small", - "extrapolation_info": { - "ilo_password":"CID-AID-RID-NID", - "ilo_user":"owner", - "ip_increment":"" - }, - "host_aggregates": [ - { - "aggregate_name":"", - "properties": [ - { - "key":"", - "value":"" - } - ], - "servers": [ - { - "identifier":"", - "ilo_ip":"", - "hostname":"" - } - ] - } - ], - "_comment_servers1":"This will be auto generated", - "_comment_servers2":"This describes the entire cloud.", - "servers": [ - { - "role_name":"", - "device_name":"", - "az_name": " ", - "ha_name": " ", - "rack":"", - "ilo_info": { - "ip":"", - "user":"", - "password":"" - } - } - ] -} +{ + "_comment_head": "Maintainer - Sridhar Rao ", + "_comment_head1": "User should Configure all profiles. Add new, if reqd.", + "_comment_head2": "User should Configure the roles", + "_comment_head3": "All infos should be filled by the user", + "_comment_head4": "The servers data will be automatically generated", + "_comment_info1": "All Infos", + "management_info": { + "owner": "", + "area_name": "", + "area_center_name": "", + "room_id": "", + "city": "", + "timezone": "", + "resource_pool_id": "", + "resource_pool_name": "", + "resource_pool_type": "" + }, + "user_info": [ + { + "_comment_users1": " Access Type: PIM, VIM, etc.", + "_comment_users2": " Endpoint: Server, Switch, VIM, etc.", + "access_type": "", + "endpoint": "", + "auth_type": "", + "username": "", + "password": "", + "pub_key": "", + "passphrase": "", + "tls_ca_cert": "", + "tls_cert": "", + "tls_key": "", + "email": "" + } + ], + "ntp_info": { + "primary_ip": "", + "primary_zone": "", + "secondary_ip": "", + "secondary_zone": "" + }, + "syslog_info": { + "server_ip": "", + "transport": "" + }, + "dns_info": [ + { + "name": "", + "domain": "", + "servers": [ + { + "ip": "" + } + ] + } + ], + "proxy_info": { + "address": "", + "port": "", + "user": "", + "password": "" + }, + "ldap_info": { + "base_url": "", + "url": "", + "auth_path": "", + "common_name": "", + "subdomain": "", + "domain": "" + }, + "vim_info": { + "vim_name": " ", + "vim_id": " ", + "vendor": " ", + "version": " ", + "installer": "", + "deployment_style": "", + "container_orchestrator": "", + "storage_type": "" + }, + "_comment_deployment": " Type can be OOK or NOOK, block storage method is rbd or iscsi", + "deployment_info": { + "high_availability": "", + "introspection": "", + "deployment_type": "", + "installer_used": "", + "workload_vnf": "", + "workload_cnf": "", + "sdn_controller": "", + "sdn_controller_version": "", + "sdn_controller_nbapps": "", + "vnfm": "", + "vnfm_version": "", + "data_plane_used": "", + "ironic_deploy_interface": "", + "ip_type": "", + "external_storage_cluster": "", + "blk_str_connect_method": "" + }, + "vim_functional": { + "scheduler_filters": "", + "cpu_allocation_ratio": "" + }, + "jumphost_info": { + "ip": "", + "name": "" + }, + "rack_info": [ + { + "rack_id": "", + "rack_details": { + "rack_name": "", + "rack_description": "", + "rack_az": "", + "rack_room": "", + "rack_raw": "", + "rack_number": "" + } + } + ], + "storage_cluster_info": { + "name": "", + "cluster_type": "", + "vendor": "", + "version": "", + "cluster_id": "", + "auth_type": "", + "username": "", + "password": "", + "certificate_location": "", + "client_key": "", + "mon_host_ips": [ + { + "ip": "" + } + ], + "public_cidr": "", + "cluster_cidr": "", + "nodes": [ + { + "name": "", + "id": "" + } + ], + "pools": [ + { + "key": "", + "value": "" + } + ], + "max_quota_capacity": "", + "az_name": "", + "backup_policy": "", + "networks": [ + { + "name": "" + } + ] + }, + "_comment_info2": "End of Information - Except Software-INFO", + "bios_profiles": [ + { + "profile_name": "", + "bios_info": { + "bios_version": "", + "bios_mode": "", + "bootstrap_proto": "", + "hyperthreading_enabled": "", + "_comment": "C4_C6_MLC-STR_MLC-SPA_DCU_DCA_RAS_TURBO", + "bios_setting": "" + } + } + ], + "bmc_profiles": [ + { + "profile_name": "", + "bmc_info": { + "version": "" + } + } + ], + "processor_profiles": [ + { + "profile_name": "", + "profile_info": { + "manufacturer": "", + "generation": "", + "speed": "", + "model": "", + "architecture": "", + "cpu_cflags": "", + "cache_size": "", + "numas": [ + { + "node_id": "", + "cpu_set": "" + } + ] + } + } + ], + "disks_profiles": [ + { + "profile_name": "", + "profile_info": [ + { + "alias": "", + "vendor": "", + "address": "", + "size": "", + "model": "", + "dev_type": "", + "rotation": "", + "bus": "", + "logical_name": "" + } + ] + } + ], + "nic_profiles": [ + { + "profile_name": "", + "profile_info": [ + { + "alias": "", + "name": "", + "address": "", + "dev_type": "", + "bus": "", + "sriov_capable": "", + "numa_id": "" + } + ] + } + ], + "hardware_profiles": [ + { + "profile_name": "", + "profile_id": "", + "profile_info": { + "manufacturer": "", + "sku": "", + "model": "", + "generation": "", + "bios_profile": "", + "bmc_profile": "", + "processor_profile": "", + "memory": "", + "disks_profile": "", + "nics_profile": "" + } + } + ], + "switch_profiles": [ + { + "profile_name": "", + "profile_id": "", + "profile_info": { + "manufacturer": "", + "sku": "", + "model": "", + "generation": "", + "bios_profile": "", + "bmc_profile": "", + "nics_profile": "" + } + } + ], + "_comment_hw": " Hardware Information is complete", + "storage_profile": [ + { + "name": "", + "bootdrive": "", + "bd_partitions": [ + { + "name": "", + "size": "", + "bootable": "", + "filesystem": { + "mountpoint": "", + "fstype": "", + "mount_options": "" + } + } + ], + "data_devices": [ + { + "name": "", + "partitions": [ + { + "name": "ceph", + "size": "available", + "filesystem": { + "mountpoint": "/var/lib/ceph", + "fstype": "ext4", + "mount_options": "defaults" + } + } + ] + } + ], + "journal_devices": [ + { + "name": "" + } + ] + } + ], + "_comment_nw1": "Network Info, Please include IPMI & Physnets info too", + "networks": [ + { + "name": "", + "vips": [ + { + "name": "", + "ip": "" + } + ], + "tunnel_type": "", + "tunnel_id": "", + "tunnel_id_range": "", + "mtu": "", + "routedomain": "", + "cidr": "", + "dns": "", + "routes": [ + { + "subnet": "", + "gateway": "", + "metric": "", + "routedomain": "" + } + ], + "allocation_pools": [ + { + "type": "", + "start": "", + "end": "" + } + ], + "v6_cidr": "", + "v6_allocation_pools": [ + { + "type": "", + "start": "", + "end": "" + } + ] + } + ], + "_comment_nw_2": "These are specific to Infrastructure manager", + "physical_networks": [ + { + "name": "external", + "cidr": "", + "type": "flat" + } + ], + "_comment_nw3": " type: trunk (airship), bond, interface, bridge", + "network_link": [ + { + "name": "", + "type": "", + "bonding_mode": "", + "mtu": "", + "linkspeed": "auto", + "trunking_mode": "", + "trunking_default_nw": "", + "metadata": [ + { + "key": "", + "value": "" + } + ], + "members": [ + { + "name": "", + "type": "" + } + ], + "vid": "", + "vf_count": "" + } + ], + "_comment_nw4": "The link_name could be i/f, bond, bridges", + "_comment_nw5": "These profiles are mapped to roles", + "link_nw_mapping_profiles": [ + { + "profile_name": "", + "profile_data": [ + { + "link_name": "", + "link_type": "", + "networks": [ + { + "name": "" + } + ], + "use_dhcp": "" + } + ] + } + ], + "platform_profiles": [ + { + "profile_name": "", + "os": "", + "rt_kvm": "", + "kernel_version": "", + "kernel_parameters": "", + "isolated_cpus": "", + "vnf_cores": "", + "os_reserved_cores": " ", + "hugepage_count": "", + "hugepages": [ + { + "hugepage_count": "", + "hugepage_size": "" + } + ], + "iommu": "", + "vswitch_daemon_cores": " ", + "vswitch_type": "", + "vswitch_uio_driver": "", + "vswitch_mem_channels": "", + "vswitch_socket_memory": "", + "vswitch_pmd_cores": "", + "vswitch_dpdk_lcores": "", + "vswitch_dpdk_rxqs": "", + "vswitch_options": "" + } + ], + "undercloud_ook": { + "dns": { + "cluster_domain": "", + "service_ip": "" + }, + "etcd": { + "service_ip": "", + "container_port": "", + "haproxy_port": "" + }, + "masters": [ + { + "hostname": "" + } + ], + "networking": { + "type": "", + "interface_used": "", + "api_service_ip": "", + "etcd_service_ip": "", + "pod_cidr": "", + "service_cidr": "", + "apiserver_port": "", + "haproxy_port": "", + "servicenode_port_range": "" + }, + "kvps": [ + { + "key": "", + "value": "" + } + ] + }, + "undercloud_ooo": { + "host_name": "", + "local_ip": "", + "public_host": "", + "admin_host": "", + "local_interface": "", + "inspection_interface": "", + "networking": { + "ctrlplane_cidr": "", + "ctrlplane_ip_start": "", + "ctrlplane_ip_end": "", + "inspection_range": "", + "gateway": "" + } + }, + "switch_topology": [ + { + "top_id": "", + "top_name": "", + "vertices": [ + { + "vertex_id": "", + "node1_id": "", + "node1_port": "", + "node2_id": "", + "node2_port": "", + "vertex_type": "" + } + ] + } + ], + "_comment_sw1": "Software Begins", + "undercloud_sw_profiles": [ + { + "profile_name": "", + "sw_list": [ + { + "name": "", + "version": "" + } + ] + } + ], + "openstack_sw_profiles": [ + { + "profile_name": "", + "sw_list": [ + { + "name": "", + "version": "" + } + ] + } + ], + "infra_sw_profiles": [ + { + "profile_name": "", + "sw_list": [ + { + "name": "", + "version": "" + } + ] + } + ], + "software_set": [ + { + "set_name": "", + "undercloud_profile": "", + "infrasw_profile": "", + "openstack_profile": "" + } + ], + "_comment_role1": "User has to configure this - What profile to use for a role", + "_comment_role2": "Based on this server_info will be autogenerated for all servers", + "roles": [ + { + "name": "", + "hostname_prefix": "", + "hostname_suffix": "", + "hostname_number_start": "", + "count": "", + "hardware_profile": "", + "interface_mapping": "", + "storage_mapping": "", + "platform_profile": "", + "sw_set_name": "", + "metadata": [ + { + "on_count_condition": "", + "count": "", + "key": "", + "value": "" + } + ] + } + ], + "_comment_ex1": "C:City, A:Area, R:Room, N:Unique Number", + "_comment_ex2": "All are 2 characters. City-Capitals, Area-Small", + "extrapolation_info": { + "ilo_password": "CID-AID-RID-NID", + "ilo_user": "owner", + "ip_increment": "" + }, + "host_aggregates": [ + { + "aggregate_name": "", + "properties": [ + { + "key": "", + "value": "" + } + ], + "servers": [ + { + "identifier": "", + "ilo_ip": "", + "hostname": "" + } + ] + } + ], + "_comment_servers1": "This will be auto generated", + "_comment_servers2": "This describes the entire cloud.", + "servers": [ + { + "role_name": "", + "device_name": "", + "az_name": " ", + "ha_name": " ", + "rack": "", + "ilo_info": { + "ip": "", + "user": "", + "password": "" + }, + "service_info": { + "service_ip": "" + } + } + ] +} \ No newline at end of file -- cgit 1.2.3-korg