From b2d0191973a757559115b6f1a65a73507e47b57b Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Tue, 14 Apr 2015 16:36:31 +0000
Subject: Integrate Nova with Ironic

Change-Id: I2eee55408b174dc820ce713e6821f200a1532a48
---
 openstack/usr/share/openstack/nova/nova-compute.conf |  2 +-
 openstack/usr/share/openstack/nova/nova.conf         | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'openstack')

diff --git a/openstack/usr/share/openstack/nova/nova-compute.conf b/openstack/usr/share/openstack/nova/nova-compute.conf
index b19de1d3..8d186211 100644
--- a/openstack/usr/share/openstack/nova/nova-compute.conf
+++ b/openstack/usr/share/openstack/nova/nova-compute.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-compute_driver=libvirt.LibvirtDriver
+compute_driver={{ COMPUTE_DRIVER }}
 [libvirt]
 virt_type={{ NOVA_VIRT_TYPE }}
diff --git a/openstack/usr/share/openstack/nova/nova.conf b/openstack/usr/share/openstack/nova/nova.conf
index 04cec1c6..6e49b4cc 100644
--- a/openstack/usr/share/openstack/nova/nova.conf
+++ b/openstack/usr/share/openstack/nova/nova.conf
@@ -420,7 +420,7 @@ enabled_apis=ec2,osapi_compute,metadata
 #metadata_workers=<None>
 
 # Full class name for the Manager for compute (string value)
-#compute_manager=nova.compute.manager.ComputeManager
+compute_manager={{ COMPUTE_MANAGER }}
 
 # Full class name for the Manager for console proxy (string
 # value)
@@ -970,7 +970,7 @@ osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions
 
 # Amount of memory in MB to reserve for the host (integer
 # value)
-#reserved_host_memory_mb=512
+reserved_host_memory_mb={{ RESERVED_HOST_MEMORY_MB }}
 
 # Class that will manage stats for the local compute host
 # (string value)
@@ -1627,7 +1627,7 @@ use_syslog=True
 #
 
 # The scheduler host manager class to use (string value)
-#scheduler_host_manager=nova.scheduler.host_manager.HostManager
+scheduler_host_manager={{ SCHEDULER_HOST_MANAGER }}
 
 
 #
@@ -1719,7 +1719,7 @@ use_syslog=True
 # for RamFilter. For AggregateRamFilter, it will fall back to
 # this configuration value if no per-aggregate setting found.
 # (floating point value)
-#ram_allocation_ratio=1.5
+ram_allocation_ratio={{ RAM_ALLOCATION_RATIO }}
 
 
 #
@@ -1867,7 +1867,7 @@ scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
 # include: libvirt.LibvirtDriver, xenapi.XenAPIDriver,
 # fake.FakeDriver, baremetal.BareMetalDriver,
 # vmwareapi.VMwareVCDriver, hyperv.HyperVDriver (string value)
-compute_driver=libvirt.LibvirtDriver
+compute_driver={{ COMPUTE_DRIVER }}
 
 # The default format an ephemeral_volume will be formatted
 # with on creation. (string value)
@@ -2559,19 +2559,19 @@ api_servers=$host:$port
 #api_version=1
 
 # URL for Ironic API endpoint. (string value)
-#api_endpoint=<None>
+api_endpoint=http://{{ CONTROLLER_HOST_ADDRESS }}:6385/v1
 
 # Ironic keystone admin name (string value)
-#admin_username=<None>
+admin_username={{ IRONIC_SERVICE_USER }}
 
 # Ironic keystone admin password. (string value)
-#admin_password=<None>
+admin_password={{ IRONIC_SERVICE_PASSWORD }}
 
 # Ironic keystone auth token. (string value)
 #admin_auth_token=<None>
 
 # Keystone public API endpoint. (string value)
-#admin_url=<None>
+admin_url=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
 
 # Log level override for ironicclient. Set this in order to
 # override the global "default_log_levels", "verbose", and
@@ -2579,7 +2579,7 @@ api_servers=$host:$port
 #client_log_level=<None>
 
 # Ironic keystone tenant name. (string value)
-#admin_tenant_name=<None>
+admin_tenant_name=service
 
 # How many retries when a request does conflict. (integer
 # value)
-- 
cgit v1.2.1