From 3413824166e9e7fd92eb0d470cb2031a6f3c83ba Mon Sep 17 00:00:00 2001 From: "Kyle L. Henderson" Date: Fri, 13 Oct 2017 07:44:07 -0500 Subject: [PATCH] Add config parameter for nova config drive Nova config drive can be used to pass parameters and files to the database instances. In cases where file injection cannot be used by nova, trove can be configured to tell nova to use config drive support instead. Nova will then use config drive to configure the database instance. Change-Id: I29c1d0e935603a849c2500b2f298b7a6fa84cb28 --- src/config.yaml | 6 ++++++ src/templates/mitaka/trove-taskmanager.conf | 2 +- src/templates/newton/trove-taskmanager.conf | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/config.yaml b/src/config.yaml index 14034b9..c0417d7 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -71,3 +71,9 @@ options: description: | List of IDs for management networks which should be attached to the instance regardless of what NICs are specified in the create API call. + use-nova-server-config-drive: + default: False + type: boolean + description: | + Nova config drive will be used with cloud-init to inject parameters and + files into the database instances. diff --git a/src/templates/mitaka/trove-taskmanager.conf b/src/templates/mitaka/trove-taskmanager.conf index 2e8ad8e..cbe2853 100644 --- a/src/templates/mitaka/trove-taskmanager.conf +++ b/src/templates/mitaka/trove-taskmanager.conf @@ -62,7 +62,7 @@ server_delete_time_out=480 # Nova server boot options # sets the --config-drive argument when doing a nova boot # (controls how file injection is handled by nova) -use_nova_server_config_drive = False +use_nova_server_config_drive = {{ options.use_nova_server_config_drive }} # ================= Guestagent related ======================== guest_config = /etc/trove/conf.d/trove-guestagent.conf diff --git a/src/templates/newton/trove-taskmanager.conf b/src/templates/newton/trove-taskmanager.conf index 8deffb5..a964d59 100644 --- a/src/templates/newton/trove-taskmanager.conf +++ b/src/templates/newton/trove-taskmanager.conf @@ -59,7 +59,7 @@ server_delete_time_out=480 # Nova server boot options # sets the --config-drive argument when doing a nova boot # (controls how file injection is handled by nova) -use_nova_server_config_drive = False +use_nova_server_config_drive = {{ options.use_nova_server_config_drive }} # ================= Guestagent related ======================== guest_config = /etc/trove/conf.d/trove-guestagent.conf