From 3fe75598de97c73c95d83739e6ed11277b619988 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Thu, 9 Aug 2018 15:53:40 +0200 Subject: [baremetal] idf for opnfv_vm and update the pdf Physical hardware PODs provide a pdf and a idf to describe hardware and other information (e.g. what is the purpose for each interface). To reuse the same code for opnfv vm and also become consistent, we should also describe the opnfv vm with an idf and a pdf. This patch simplifies what needs to be done for baremetal, especially for this (future) patch: https://gerrit.opnfv.org/gerrit/#/c/60797/11 As we add an idf, we should update dynamic_inventory and how we create the opnfv vm. Obviously, he opnfv_vm.yml gets removed. Change-Id: I930728474631fc214e4a9adc8581e0c16d230176 Signed-off-by: Manuel Buil --- xci/infra/bifrost/playbooks/xci-create-virtual.yml | 3 +- xci/playbooks/dynamic_inventory.py | 40 +++++++++++++ .../roles/create-vm-nodes/tasks/create_vm.yml | 6 +- xci/playbooks/roles/create-vm-nodes/tasks/main.yml | 2 +- .../roles/create-vm-nodes/templates/net.xml.j2 | 8 +-- .../roles/create-vm-nodes/templates/vm.xml.j2 | 10 +--- xci/var/opnfv_vm.yml | 67 ---------------------- xci/var/opnfv_vm_idf.yml | 19 ++++++ xci/var/opnfv_vm_pdf.yml | 53 +++++++++++++++++ 9 files changed, 123 insertions(+), 85 deletions(-) delete mode 100644 xci/var/opnfv_vm.yml create mode 100644 xci/var/opnfv_vm_idf.yml create mode 100644 xci/var/opnfv_vm_pdf.yml diff --git a/xci/infra/bifrost/playbooks/xci-create-virtual.yml b/xci/infra/bifrost/playbooks/xci-create-virtual.yml index bc40d108..381c4fd4 100644 --- a/xci/infra/bifrost/playbooks/xci-create-virtual.yml +++ b/xci/infra/bifrost/playbooks/xci-create-virtual.yml @@ -14,7 +14,8 @@ vars_files: - "{{ pdf_file }}" - "{{ idf_file }}" - - "{{ xci_path }}/xci/var/opnfv_vm.yml" + - "{{ xci_path }}/xci/var/opnfv_vm_pdf.yml" + - "{{ xci_path }}/xci/var/opnfv_vm_idf.yml" - "{{ xci_path }}/xci/var/opnfv.yml" pre_tasks: - name: Load distribution variables diff --git a/xci/playbooks/dynamic_inventory.py b/xci/playbooks/dynamic_inventory.py index f6e93398..7f60f94e 100755 --- a/xci/playbooks/dynamic_inventory.py +++ b/xci/playbooks/dynamic_inventory.py @@ -76,6 +76,8 @@ class XCIInventory(object): def read_pdf_idf(self): pdf_file = os.environ['PDF'] idf_file = os.environ['IDF'] + opnfv_file = os.path.dirname(os.path.realpath(__file__)) + "/../var/opnfv_vm_pdf.yml" + opnfv_idf_file = os.path.dirname(os.path.realpath(__file__)) + "/../var/opnfv_vm_idf.yml" nodes = [] host_networks = {} @@ -93,6 +95,21 @@ class XCIInventory(object): print(e) sys.exit(1) + with open(opnfv_file) as f: + try: + opnfv_pdf = yaml.safe_load(f) + except yaml.YAMLError as e: + print(e) + sys.exit(1) + + with open(opnfv_idf_file) as f: + try: + opnfv_idf = yaml.safe_load(f) + except yaml.YAMLError as e: + print(e) + sys.exit(1) + + valid_host = (host for host in idf['xci']['installers'][self.installer]['nodes_roles'] \ if host in idf['xci']['flavors'][self.flavor] \ and host != 'opnfv') @@ -119,10 +136,33 @@ class XCIInventory(object): if 'dns' in ndata.keys(): host_networks[hostname][network]['dns'] = str(ndata['dns']) + # Get also vlan and mac_address from pdf + host_networks[hostname][network]['mac_address'] = str(pdf_host_info['interfaces'][int(network_interface_num)]['mac_address']) + host_networks[hostname][network]['vlan'] = str(pdf_host_info['interfaces'][int(network_interface_num)]['vlan']) + + # Get also vlan and mac_address from opnfv_pdf + mgmt_idf_index = int(opnfv_idf['opnfv_vm_idf']['net_config']['mgmt']['interface']) + opnfv_mgmt = opnfv_pdf['opnfv_vm_pdf']['interfaces'][mgmt_idf_index] + admin_idf_index = int(opnfv_idf['opnfv_vm_idf']['net_config']['admin']['interface']) + opnfv_public = opnfv_pdf['opnfv_vm_pdf']['interfaces'][admin_idf_index] + self.opnfv_networks['opnfv']['mgmt']['mac_address'] = str(opnfv_mgmt['mac_address']) + self.opnfv_networks['opnfv']['mgmt']['vlan'] = str(opnfv_mgmt['vlan']) + self.opnfv_networks['opnfv']['public']['mac_address'] = str(opnfv_public['mac_address']) + self.opnfv_networks['opnfv']['public']['vlan'] = str(opnfv_public['vlan']) + + # Add the interfaces from idf + + host_networks.update(self.opnfv_networks) self.add_groupvar('all', 'host_info', host_networks) + if 'deployment_host_interfaces' in idf['xci']['installers'][self.installer]['network']: + mgmt_idf_index = int(opnfv_idf['opnfv_vm_idf']['net_config']['mgmt']['interface']) + admin_idf_index = int(opnfv_idf['opnfv_vm_idf']['net_config']['admin']['interface']) + self.add_hostvar('deployment_host', 'network_interface_admin', idf['xci']['installers'][self.installer]['network']['deployment_host_interfaces'][admin_idf_index]) + self.add_hostvar('deployment_host', 'network_interface_mgmt', idf['xci']['installers'][self.installer]['network']['deployment_host_interfaces'][mgmt_idf_index]) + # Now add the additional groups for parent in idf['xci']['installers'][self.installer]['groups'].keys(): map(lambda x: self.add_group(x, parent), idf['xci']['installers'][self.installer]['groups'][parent]) diff --git a/xci/playbooks/roles/create-vm-nodes/tasks/create_vm.yml b/xci/playbooks/roles/create-vm-nodes/tasks/create_vm.yml index 700c6c72..df019c88 100644 --- a/xci/playbooks/roles/create-vm-nodes/tasks/create_vm.yml +++ b/xci/playbooks/roles/create-vm-nodes/tasks/create_vm.yml @@ -128,9 +128,13 @@ command: get_xml register: vm_xml + - name: Fetch the index for admin network + set_fact: + admin_index: "{{ (vm_name == 'opnfv') | ternary(opnfv_vm_idf.net_config.admin.interface, idf.net_config.admin.interface) | int }}" + - name: Fetch the ip set_fact: - vm_ip: "{%- for interface in item.1.interfaces %}{%- if 'native' in (interface.vlan | string) %}{{ interface.address }}{%- endif %}{%- endfor %}" + vm_ip: "{{ item.1.interfaces[admin_index | int].address }}" # Assumes there is only a single NIC per VM - name: get MAC from vm XML diff --git a/xci/playbooks/roles/create-vm-nodes/tasks/main.yml b/xci/playbooks/roles/create-vm-nodes/tasks/main.yml index c1cee6dc..64857d80 100644 --- a/xci/playbooks/roles/create-vm-nodes/tasks/main.yml +++ b/xci/playbooks/roles/create-vm-nodes/tasks/main.yml @@ -18,7 +18,7 @@ # First we create the opnfv_vm - include_tasks: create_vm.yml - with_indexed_items: "{{ [opnfv_vm] + nodes }}" + with_indexed_items: "{{ [opnfv_vm_pdf] + nodes }}" - name: Start the opnfv vm virt: diff --git a/xci/playbooks/roles/create-vm-nodes/templates/net.xml.j2 b/xci/playbooks/roles/create-vm-nodes/templates/net.xml.j2 index 3c082170..7e372ffe 100644 --- a/xci/playbooks/roles/create-vm-nodes/templates/net.xml.j2 +++ b/xci/playbooks/roles/create-vm-nodes/templates/net.xml.j2 @@ -6,13 +6,9 @@ - + - {%- for interface in opnfv_vm.interfaces %} - {%- if 'native' in (interface.vlan | string) %} - - {%- endif %} - {%- endfor %} + diff --git a/xci/playbooks/roles/create-vm-nodes/templates/vm.xml.j2 b/xci/playbooks/roles/create-vm-nodes/templates/vm.xml.j2 index 5c235f55..e4e41eda 100644 --- a/xci/playbooks/roles/create-vm-nodes/templates/vm.xml.j2 +++ b/xci/playbooks/roles/create-vm-nodes/templates/vm.xml.j2 @@ -35,19 +35,11 @@
- {% set native_interfaces = [] %} - {%- for interface in item.1.interfaces %} - {%- if 'native' in (interface.vlan | string) %} - {%- set _ = native_interfaces.append(interface) %} - {%- endif %} - {%- endfor %} - {%- for interface in native_interfaces -%} - + - {% endfor -%}