openstack/bifrost
Code Issues Proposed changes

Merge "Make use of host fact collection for name based inventories"

Browse Source
This commit is contained in:
Jenkins 2015-10-05 22:02:04 +00:00 committed by Gerrit Code Review
commit 37180dff9c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/bifrost-configdrives-dynamic/tasks/main.yml
View File

@ -12,6 +12,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
# Note(TheJulia): Fact collection from ironic is necessary to obtain
# the host's assigned UUID value.
- name: "Update facts from ironic to fill in any missing values"
include: update_facts_from_ironic.yaml
- name: "Identify ssh_public_key if ssh_public_key_path is defined" - name: "Identify ssh_public_key if ssh_public_key_path is defined"
include: ssh_public_key_path.yaml include: ssh_public_key_path.yaml
when: ssh_public_key is undefined and ssh_public_key_path is defined when: ssh_public_key is undefined and ssh_public_key_path is defined

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

@ -34,7 +34,7 @@
when: instance_info is not defined when: instance_info is not defined
- name: "Error if deploy_image is not present, and instance_info is not defined" - name: "Error if deploy_image is not present, and instance_info is not defined"
fail: msg="The user-defined deploy_image, which is the image to be written to the remote node(s) upon deployment, was not found. Cannot proceed." fail: msg="The user-defined deploy_image, which is the image to be written to the remote node(s) upon deployment, was not found. Cannot proceed."
when: test_deploy_image.stat.exists | bool == false and instance_info is not defined when: instance_info is not defined and test_deploy_image.stat.exists | bool == false
- name: "Deploy to hardware - bifrost default" - name: "Deploy to hardware - bifrost default"
os_ironic_node: os_ironic_node:
auth_type: None auth_type: None