Cleanup and changes required for role updates

install.yaml

@@ -1,8 +1,8 @@
 ---
 - hosts: localhost
-  connection: local
   name: "Install Ironic on the local host."
+  connection: local
   sudo: yes
   gather_facts: yes
   roles:
-    - install-ironic
+    - ironic-install

roles/ironic-install/defaults/main.yml

@@ -25,7 +25,6 @@ required_packages_ubuntu:
   - genisoimage
   - kpartx
 http_boot_folder: /httpboot
-transform_boot_image: false
 ironic_url: "http://localhost:6385/"
 ssh_public_key_path: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
 dib_env_vars:
@@ -35,3 +34,32 @@ dib_env_vars:
 extra_dib_elements: ""
 create_image_via_dib: true
 transform_boot_image: false
+##mysql_password:
+# If testing is true, then the environment is setup for using libvirt
+# virtual machines for the hardware instead of real hardware.
+testing: false
+http_boot_folder: /httpboot
+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"
+deploy_ramdisk_url: "http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:8080/coreos_production_pxe_image-oem.cpio.gz"
+deploy_image_filename: "trusty-server-cloudimg-amd64.img"
+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
+##ipv4_nameserver: 8.8.8.8
+##dhcp_pool_start: 192.168.1.200
+##dhcp_pool_end: 192.168.1.250
+# ipmi_bridging: Default undefined.  Valid values: "no", "single", and "dual"
+# See http://docs.openstack.org/developer/ironic/_modules/ironic/drivers/modules/ipmitool.html
+#ipmi_bridging: no
+
+# When testing with VMs, define SSH address, port, and user for agent_ssh driver.
+ssh_username: ironic
+ssh_port: 1024
+ssh_address: 127.0.0.1
+ssh_private_key_path: /home/ironic/.ssh/id_rsa
+

roles/ironic-install/meta/main.yml

@@ -5,112 +5,12 @@ galaxy_info:
   company: OpenStack
   license: Apache
   min_ansible_version: 1.9
-  #
-  # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your 
-  # platform on this list, let us know and we'll get it added!
-  #
   platforms:
-  #- name: EL
+  - name: Ubuntu
-  #  versions:
+    versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
     - trusty
-  #- name: SLES
+    - utopic
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
   categories:
   - cloud
   - cloud:openstack
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
 dependencies: []

roles/ironic-install/tasks/main.yml

@@ -26,12 +26,12 @@
   when: ansible_distribution_version|version_compare('14.10', '>=')
 - name: "Install testing packages"
   apt: name={{ item }}
+  when: testing is defined and testing == true
   with_items:
     - libvirt-bin
     - qemu-utils
     - qemu-kvm
     - sgabios
-  when: testing == true
 - name: "Ensuring /opt/stack is present"
   file: name=/opt/stack state=directory owner=root group=root
 - name: "Retrieving latest known os_ironic.py file"