From 7751e84197ec65ef939171837d0d679e4ca1deb4 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Tue, 3 Mar 2015 12:12:43 -0500 Subject: [PATCH] Adding installation of os_ironic_node module Added installation of the under development os_ironic_node module and install the pre-requisite update to the shade library which includes support for deploying ironic nodes. --- inventory/group_vars/all.yaml | 1 + setup/install.yaml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/all.yaml b/inventory/group_vars/all.yaml index b20772497..24b649fec 100644 --- a/inventory/group_vars/all.yaml +++ b/inventory/group_vars/all.yaml @@ -7,6 +7,7 @@ testing: true http_boot_folder: /httpboot ssh_public_key_path: ~/.ssh/id_rsa.pub latest_os_ironic_url: https://raw.githubusercontent.com/juliakreger/ansible-modules-extras/features/new-openstack/cloud/os_ironic.py +latest_os_ironic_node_url: https://raw.githubusercontent.com/juliakreger/ansible-modules-extras/features/new-openstack/cloud/os_ironic_node.py deploy_kernel: "{{http_boot_folder}}/coreos_production_pxe.vmlinuz" deploy_ramdisk: "{{http_boot_folder}}/coreos_production_pxe_image-oem.cpio.gz" deploy_kernel_url: "http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:8080/coreos_production_pxe.vmlinuz" diff --git a/setup/install.yaml b/setup/install.yaml index 6e2dae4f7..b7e474004 100644 --- a/setup/install.yaml +++ b/setup/install.yaml @@ -45,6 +45,8 @@ # lands upstream, it is required. - name: "Retrieving latest known os_ironic.py file" local_action: get_url url={{ latest_os_ironic_url }} dest=/opt/stack/ansible/lib/ansible/modules/extras/cloud/os_ironic.py + - name: "Retrieving latest known os_ironic_node.py file" + local_action: get_url url={{ latest_os_ironic_node_url }} dest=/opt/stack/ansible/lib/ansible/modules/extras/cloud/os_ironic_node.py - name: "Downloading Ironic" local_action: command git clone https://git.openstack.org/openstack/ironic chdir=/opt/stack creates=/opt/stack/ironic # TODO: Remove eventually once the features land. @@ -96,7 +98,7 @@ - name: "Shade - Resyncing local reposiory" local_action: command git pull --ff-only chdir=/opt/stack/shade - name: "Shade - Downloading patch to support noauth mode." - local_action: command git fetch https://review.openstack.org/openstack-infra/shade refs/changes/09/159609/5 chdir=/opt/stack/shade + local_action: command git fetch https://review.openstack.org/openstack-infra/shade refs/changes/94/160894/2 chdir=/opt/stack/shade - name: "Shade - Checking out patch to support noauth mode." local_action: command git checkout FETCH_HEAD chdir=/opt/stack/shade - name: "Shade - Installing patched shade library."