diff options
Diffstat (limited to 'xci/infra/bifrost/playbooks/opnfv-virtual.yml')
| -rw-r--r-- | xci/infra/bifrost/playbooks/opnfv-virtual.yml | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/xci/infra/bifrost/playbooks/opnfv-virtual.yml b/xci/infra/bifrost/playbooks/opnfv-virtual.yml index 68d76cfc..f97eae4b 100644 --- a/xci/infra/bifrost/playbooks/opnfv-virtual.yml +++ b/xci/infra/bifrost/playbooks/opnfv-virtual.yml @@ -52,7 +52,7 @@ mode: '0755' owner: 'root' group: 'root' - when: use_prebuilt_images | bool == true + when: create_image_via_dib | bool == false - name: Ensure /etc/hosts has good defaults lineinfile: create: yes @@ -76,19 +76,17 @@ testing: false enabled_hardware_types: ipmi network_interface: "{{ ansible_default_ipv4.interface }}" - # NOTE(TheJulia): While the next step creates a ramdisk, some elements - # do not support ramdisk-image-create as they invoke steps to cleanup - # the ramdisk which causes ramdisk-image-create to believe it failed. + # Create the IPA image for ironic to boot the nodes and write the final distro in the hard drive + # fedora is used because it is the only one working with ericsson-pod2 (it has support for newer hardware) - role: bifrost-create-dib-image dib_imagename: "{{ http_boot_folder }}/ipa" build_ramdisk: false - dib_os_element: "{{ ipa_dib_os_element|default('debian') }}" - dib_os_release: "jessie" + dib_os_element: "{{ ipa_dib_os_element|default('fedora') }}" dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}" dib_notmpfs: true when: - create_ipa_image | bool == true - - not use_prebuilt_images | bool == false + # Create the final distro image - role: bifrost-create-dib-image dib_imagetype: "qcow2" dib_imagename: "{{deploy_image}}" @@ -103,7 +101,6 @@ when: - create_image_via_dib | bool == true - transform_boot_image | bool == false - - use_prebuilt_images | bool == false - role: bifrost-keystone-client-config clouds: bifrost: @@ -128,10 +125,6 @@ setup: delegate_to: opnfv delegate_facts: False - - name: "Override default bifrost DNS if we are behind a proxy" - set_fact: - ipv4_nameserver: "192.168.122.1" - when: lookup('env','http_proxy') != '' - name: Find network interface in the OPNFV node set_fact: network_interface: "{{ ansible_default_ipv4.interface }}" @@ -147,6 +140,8 @@ - import_role: name: bifrost-configdrives-dynamic private: True + vars: + ipv4_nameserver: "{{ host_info[inventory_hostname]['public']['dns'] | list }}" delegate_to: opnfv - import_role: name: bifrost-deploy-nodes-dynamic |