From c718741add81b6b280895ddf0c4209a2a57fc16a Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Thu, 26 Feb 2015 17:09:47 -0500
Subject: [PATCH] Minor cleanup, centralized inventory

---
 enroll/{README.txt => README.rst} | 5 +++--
 enroll/enroll.yaml                | 2 +-
 inventory/group_vars/all.yaml     | 2 ++
 {enroll => inventory}/localhost   | 0
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename enroll/{README.txt => README.rst} (71%)
 create mode 100644 inventory/group_vars/all.yaml
 rename {enroll => inventory}/localhost (100%)

diff --git a/enroll/README.txt b/enroll/README.rst
similarity index 71%
rename from enroll/README.txt
rename to enroll/README.rst
index 9f46acf14..19c110767 100644
--- a/enroll/README.txt
+++ b/enroll/README.rst
@@ -4,7 +4,8 @@ Getting Started
 Requirements:
 
 - openstack-infra/shade library -> https://review.openstack.org/159609
-- openstack-infra/os-client-config ->  https://review.openstack.org/159563
+- openstack-infra/os-client-config -> https://review.openstack.org/159563
+- os_baremetal ansible module under development -> https://github.com/juliakreger/ansible-modules-extras/blob/features/new-openstack/cloud/os_baremetal.py
 - Information defining your hardware in a CSV file.
 
 CSV File Format
@@ -35,4 +36,4 @@ The enroll.yaml playbook, requires a variable be set or passed into the playbook
 
 Example:
 
-ansible-playbook -i localhost -vvvv enroll.yaml -e baremetal_csv_file=./baremetal.csv
+ansible-playbook -i ../inventory/localhost -vvvv enroll.yaml -e baremetal_csv_file=./baremetal.csv
diff --git a/enroll/enroll.yaml b/enroll/enroll.yaml
index 0d5cd3aa3..862c6349f 100644
--- a/enroll/enroll.yaml
+++ b/enroll/enroll.yaml
@@ -32,7 +32,7 @@
       os_baremetal:
         auth_plugin: None
         auth: None
-        ironic_url: "http://localhost:6385/"
+        ironic_url: "{{ ironic_url }}"
         driver: "pxe_ipmitool"
         # UUID determination TBD for mass enrollment.
         uuid: "{{item.split(',')[9]}}"
diff --git a/inventory/group_vars/all.yaml b/inventory/group_vars/all.yaml
new file mode 100644
index 000000000..44445bba9
--- /dev/null
+++ b/inventory/group_vars/all.yaml
@@ -0,0 +1,2 @@
+---
+ironic_url: "http://localhost:6385/"
diff --git a/enroll/localhost b/inventory/localhost
similarity index 100%
rename from enroll/localhost
rename to inventory/localhost