From 00aae60fac2a987271c60a7f9aad884548b51172 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Wed, 22 Aug 2012 18:41:27 -0700
Subject: [PATCH] Ensure the nova items needed are in the keystone component
 configuration

---
 conf/components/keystone.yaml            | 13 +++++++++++++
 tools/{interp.py => component-config.py} |  2 ++
 2 files changed, 15 insertions(+)
 rename tools/{interp.py => component-config.py} (96%)
 mode change 100644 => 100755

diff --git a/conf/components/keystone.yaml b/conf/components/keystone.yaml
index b5907acc..bfac7df5 100644
--- a/conf/components/keystone.yaml
+++ b/conf/components/keystone.yaml
@@ -25,4 +25,17 @@ glance:
   api_port: "$(glance:api_port)"
   protocol: "$(glance:protocol)"
   reg_port: "$(glance:reg_port)"
+  
+nova: 
+  api_host: "$(nova:api_host)"
+  api_port: "$(nova:api_port)"
+  s3_host: "$(nova:s3_host)"
+  s3_port: "$(nova:s3_port)"
+  volume_host: "$(nova:volume_host)"
+  volume_port: "$(nova:volume_port)"
+  ec2_host: "$(nova:ec2_host)"
+  ec2_port: "$(nova:ec2_port)"
+  ec2_admin_host: "$(nova:ec2_admin_host)"
+  ec2_admin_port: "$(nova:ec2_admin_port)"
+  protocol: "$(nova:protocol)"
 ...
diff --git a/tools/interp.py b/tools/component-config.py
old mode 100644
new mode 100755
similarity index 96%
rename from tools/interp.py
rename to tools/component-config.py
index 5df19c8b..1eefcacd
--- a/tools/interp.py
+++ b/tools/component-config.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 import os
 import sys