From 84424be8ae9597ecb6000fab13f01939e93c22a7 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Mon, 2 Mar 2015 14:10:35 -0500 Subject: [PATCH] Cleaning up variables for re-use in other steps --- inventory/group_vars/all.yaml | 2 ++ setup/install.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/all.yaml b/inventory/group_vars/all.yaml index 736c4af65..8e2fb6df3 100644 --- a/inventory/group_vars/all.yaml +++ b/inventory/group_vars/all.yaml @@ -8,6 +8,8 @@ http_boot_folder: /httpboot latest_os_ironic_url: https://raw.githubusercontent.com/juliakreger/ansible-modules-extras/features/new-openstack/cloud/os_ironic.py deploy_kernel: "{{http_boot_folder}}/coreos_production_pxe.vmlinuz" deploy_ramdisk: "{{http_boot_folder}}/coreos_production_pxe_image-oem.cpio.gz" +deploy_image_filename: "ubuntu-14.04-server-cloudimg-amd64.tar.gz" +deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}" # ipv4_subnet_mask is intended for the static ipv4 address assignments. ipv4_subnet_mask: 255.255.255.0 ipv4_gateway: 192.168.1.1 diff --git a/setup/install.yaml b/setup/install.yaml index a86b94291..ea7ec86a6 100644 --- a/setup/install.yaml +++ b/setup/install.yaml @@ -232,8 +232,8 @@ local_action: get_url url=http://tarballs.openstack.org/ironic-python-agent/coreos/files/coreos_production_pxe_image-oem.cpio.gz dest={{ http_boot_folder }}/coreos_production_pxe_image-oem.cpio.gz when: test_core_os_image_present.stat.exists == false - name: "Test if Ubuntu 14.04 server cloud amd64 is present" - local_action: stat path={{ http_boot_folder }}/ubuntu-14.04-server-cloudimg-amd64.tar.gz - register: test_core_os_image_present + local_action: stat path={{ deploy_image }} + register: test_os_image_present - name: "Download CoreOS image" - local_action: get_url url=http://cloud-images.ubuntu.com/releases/trusty/release/ubuntu-14.04-server-cloudimg-amd64.tar.gz dest={{ http_boot_folder }}/ubuntu-14.04-server-cloudimg-amd64.tar.gz - when: test_core_os_image_present.stat.exists == false + local_action: get_url url=http://cloud-images.ubuntu.com/releases/trusty/release/ubuntu-14.04-server-cloudimg-amd64.tar.gz dest={{ deploy_image }} + when: test_os_image_present.stat.exists == false