From 2b81e9c051b7686dfac31d5a608c37b65649d295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionu=C8=9B=20Ar=C8=9B=C4=83ri=C8=99i?= Date: Tue, 13 May 2014 11:39:41 +0200 Subject: [PATCH] improve documentation for miscellaneous config values Change-Id: I10441aa78a6a11c59e5d7a50ea50740c27196980 --- README.md | 7 ++++--- attributes/default.rb | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 293bc53b..a02998e3 100644 --- a/README.md +++ b/README.md @@ -249,9 +249,10 @@ OSAPI Compute Extentions Miscellaneous Options --------------------- -* `openstack["compute"]["misc_nova"]` - Array of bare options for nova.conf (e.g. 'option=value') -* `openstack["compute"]["misc_paste"]` - Array of bare options for api-paste.ini (e.g. 'option=value') -* `openstack["compute"]["misc_openrc"]` - Array of bare options for openrc (e.g. 'option=value') +Arrays whose elements will be copied exactly into the respective config files (contents e.g. ['option1=value1', 'option2=value2']). + +* `openstack["compute"]["misc_nova"]` - Array of bare options for `nova.conf`. +* `openstack["compute"]["misc_paste"]` - Array of bare options for `api-paste.ini` EC2 Configuration Attributes ---------------------------- diff --git a/attributes/default.rb b/attributes/default.rb index 1b5efbed..70277d34 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -393,7 +393,10 @@ end # plugins default['openstack']['compute']['plugins'] = nil + +# Array of options for `nova.conf` (e.g. ['option1=value1', 'option2=value2']) default['openstack']['compute']['misc_nova'] = nil +# Array of options for `api-paste.ini` (e.g. ['option1=value1', ...]) default['openstack']['compute']['misc_paste'] = nil # To disable the EC2 API endpoint, simply remove 'ec2,' from the list