openstack/bifrost
Code Issues Proposed changes

adding proxy for DIB environment variables.

Browse Source 
DIB was running with its own dib_env_vars not using
proxy set at roles level.

Change-Id: I92dbf13344d93b1fadd5d4cbebc9a66fda37d3cb
This commit is contained in:
Lokesh S 2015-07-08 06:37:58 +00:00 committed by stephane
parent 01fb404431
commit dfc0ca0381
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-create-dib-image/defaults/main.yml
View File

@ -5,5 +5,7 @@ deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}"
dib_os_element: "ubuntu" dib_os_element: "ubuntu"
dib_env_vars: dib_env_vars:
ELEMENTS_PATH: "/opt/stack/diskimage-builder/elements" ELEMENTS_PATH: "/opt/stack/diskimage-builder/elements"
http_proxy: "{{ lookup('env','http_proxy') }}"
https_proxy: "{{ lookup('env','https_proxy') }}"
# extra_dib_elements is a space separated list of elements. # extra_dib_elements is a space separated list of elements.
extra_dib_elements: "" extra_dib_elements: ""

7
playbooks/roles/ironic-install/defaults/main.yml
View File

@ -6,13 +6,6 @@ http_boot_folder: /httpboot
nginx_port: 8080 nginx_port: 8080
ironicclient_source_install: false ironicclient_source_install: false
shade_source_install: true shade_source_install: true
# Configuration information for diskimage-builder
dib_os_element: "ubuntu"
dib_env_vars:
DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive"
ELEMENTS_PATH: "/opt/stack/diskimage-builder/elements"
# extra_dib_elements is a space separated list of elements.
extra_dib_elements: ""
# Setting to utilize diskimage-builder to create a bootable image. # Setting to utilize diskimage-builder to create a bootable image.
create_image_via_dib: true create_image_via_dib: true
# Setting to prepend a partition image with a boot sector and partition table. # Setting to prepend a partition image with a boot sector and partition table.