summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-21 09:48:14 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-04 13:50:06 +0000
commit75a6df2d63e8c0b5c3fa7a2fe9ea649f1ad65c88 (patch)
tree8a246b6a8a265639c8cbd8359d18c94fc15342af
parent0575d1a0e5e4cd6768f894d6ccefbe9495ad4418 (diff)
downloaddefinitions-75a6df2d63e8c0b5c3fa7a2fe9ea649f1ad65c88.tar.gz
WIP Ironic: add back the custom configuration
Add back the custom configuration for Ironic, this time adapted for OpenStack Kilo release.
-rw-r--r--install-files/openstack/usr/share/openstack/ironic/ironic.conf36
1 files changed, 18 insertions, 18 deletions
diff --git a/install-files/openstack/usr/share/openstack/ironic/ironic.conf b/install-files/openstack/usr/share/openstack/ironic/ironic.conf
index ccf368f0..a5b5d2e3 100644
--- a/install-files/openstack/usr/share/openstack/ironic/ironic.conf
+++ b/install-files/openstack/usr/share/openstack/ironic/ironic.conf
@@ -74,7 +74,7 @@
#
# IP address of this host. (string value)
-#my_ip=10.0.0.1
+my_ip = {{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
#
@@ -102,7 +102,7 @@
# present on your system may be found by enumerating the
# "ironic.drivers" entrypoint. An example may be found in the
# developer documentation online. (list value)
-#enabled_drivers=pxe_ipmitool
+enabled_drivers=pxe_ipmitool,pxe_ssh
#
@@ -307,7 +307,7 @@
# Use syslog for logging. Existing syslog format is DEPRECATED
# during I, and will change in J to honor RFC5424. (boolean
# value)
-#use_syslog=false
+use_syslog=true
# (Optional) Enables or disables syslog rfc5424 format for
# logging. If enabled, prefixes the MSG part of the syslog
@@ -434,7 +434,7 @@
# URL of Ironic API service. If not set ironic can get the
# current value from the keystone service catalog. (string
# value)
-#api_url=<None>
+api_url = http://{{ MANAGEMENT_INTERFACE_IP_ADDRESS }}:6385
# Seconds between conductor heart beats. (integer value)
#heartbeat_interval=10
@@ -574,7 +574,7 @@
# Deprecated group/name - [DEFAULT]/sql_connection
# Deprecated group/name - [DATABASE]/sql_connection
# Deprecated group/name - [sql]/connection
-#connection=<None>
+connection = postgresql://{{ IRONIC_DB_USER}}:{{ IRONIC_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/ironic
# The SQLAlchemy connection string to use to connect to the
# slave database. (string value)
@@ -807,7 +807,7 @@
#
# Default glance hostname or IP address. (string value)
-#glance_host=$my_ip
+glance_host = {{ CONTROLLER_HOST_ADDRESS }}
# Default glance port. (integer value)
#glance_port=9292
@@ -966,7 +966,7 @@
#
# Complete public Identity API endpoint. (string value)
-#auth_uri=<None>
+auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
# API version of the admin Identity API endpoint. (string
# value)
@@ -1119,7 +1119,7 @@
# Complete admin Identity API endpoint. This should specify
# the unversioned root endpoint e.g. https://localhost:35357/
# (string value)
-#identity_uri=<None>
+identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357
# This option is deprecated and may be removed in a future
# release. Single shared secret with the Keystone
@@ -1130,13 +1130,13 @@
#admin_token=<None>
# Service username. (string value)
-#admin_user=<None>
+admin_user = {{ IRONIC_SERVICE_USER }}
# Service user password. (string value)
-#admin_password=<None>
+admin_password = {{ IRONIC_SERVICE_PASSWORD }}
# Service tenant name. (string value)
-#admin_tenant_name=admin
+admin_tenant_name=service
[matchmaker_redis]
@@ -1173,7 +1173,7 @@
#
# URL for connecting to neutron. (string value)
-#url=http://$my_ip:9696
+url = http://{{ CONTROLLER_HOST_ADDRESS }}:9696
# Timeout value for connecting to neutron in seconds. (integer
# value)
@@ -1356,11 +1356,11 @@
# The RabbitMQ broker address where a single node is used.
# (string value)
-#rabbit_host=localhost
+rabbit_host = {{ RABBITMQ_HOST }}
# The RabbitMQ broker port where a single node is used.
# (integer value)
-#rabbit_port=5672
+rabbit_port = {{ RABBITMQ_PORT }}
# RabbitMQ HA cluster host:port pairs. (list value)
#rabbit_hosts=$rabbit_host:$rabbit_port
@@ -1369,10 +1369,10 @@
#rabbit_use_ssl=false
# The RabbitMQ userid. (string value)
-#rabbit_userid=guest
+rabbit_userid = {{ RABBITMQ_USER }}
# The RabbitMQ password. (string value)
-#rabbit_password=guest
+rabbit_password = {{ RABBITMQ_PASSWORD }}
# The RabbitMQ login method. (string value)
#rabbit_login_method=AMQPLAIN
@@ -1483,11 +1483,11 @@
#tftp_server=$my_ip
# Ironic compute node's tftp root path. (string value)
-#tftp_root=/tftpboot
+tftp_root=/srv/tftp_root/
# Directory where master tftp images are stored on disk.
# (string value)
-#tftp_master_path=/tftpboot/master_images
+tftp_master_path=/srv/tftp_root/master_images
# Bootfile DHCP parameter. (string value)
#pxe_bootfile_name=pxelinux.0