openstack/bifrost
Code Issues Proposed changes

Merge "Update embedded deployment settings for protocol"

Browse Source
This commit is contained in:
Jenkins 2016-01-05 15:23:05 +00:00 committed by Gerrit Code Review
commit 7ff69efafa
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/roles/bifrost-deploy-nodes-dynamic/README.md
View File

@ -34,6 +34,12 @@ deploy_image_filename: This is the filename of the image to deploy, which is
expects to receive this information from the calling expects to receive this information from the calling
playbook. playbook.
deploy_url_protocol: The protocol to utilize to access config_drive and
image_source files. The default is to utilize HTTP in
generated HTTP URLs for bifrost, however this setting
allows a user to change that default if they they have
a modified local webserver configuration.
deploy_image: This is the full path to the image to be deployed to the system. deploy_image: This is the full path to the image to be deployed to the system.
This is as ironic requires the MD5 hash of the file to be This is as ironic requires the MD5 hash of the file to be
deployed for validation during the deployment process. As a deployed for validation during the deployment process. As a

2
playbooks/roles/bifrost-deploy-nodes-dynamic/defaults/main.yml
View File

@ -8,3 +8,5 @@ http_boot_folder: "/httpboot"
deploy_image_filename: "deployment_image.qcow2" deploy_image_filename: "deployment_image.qcow2"
deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}" deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}"
inventory_dhcp: false inventory_dhcp: false
deploy_url_protocol: "http"

6
playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml
View File

@ -35,7 +35,7 @@
ironic_url: "{{ ironic_url }}" ironic_url: "{{ ironic_url }}"
uuid: "{{ uuid }}" uuid: "{{ uuid }}"
state: present state: present
config_drive: "http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ nginx_port }}/configdrive-{{ uuid }}.iso.gz" config_drive: "{{ deploy_url_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ nginx_port }}/configdrive-{{ uuid }}.iso.gz"
instance_info: "{{ instance_info }}" instance_info: "{{ instance_info }}"
delegate_to: localhost delegate_to: localhost
when: instance_info is defined and instance_info | to_json != '{}' when: instance_info is defined and instance_info | to_json != '{}'
@ -53,9 +53,9 @@
ironic_url: "{{ ironic_url }}" ironic_url: "{{ ironic_url }}"
uuid: "{{ uuid }}" uuid: "{{ uuid }}"
state: present state: present
config_drive: "http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ nginx_port }}/configdrive-{{ uuid }}.iso.gz" config_drive: "{{ deploy_url_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ nginx_port }}/configdrive-{{ uuid }}.iso.gz"
instance_info: instance_info:
image_source: "http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ nginx_port }}/{{deploy_image_filename}}" image_source: "{{ deploy_url_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{ nginx_port }}/{{deploy_image_filename}}"
image_checksum: "{{ test_deploy_image.stat.md5 }}" image_checksum: "{{ test_deploy_image.stat.md5 }}"
image_disk_format: "qcow2" image_disk_format: "qcow2"
root_gb: 10 root_gb: 10