Merge "Uses userdata instead of personality files"
This commit is contained in:
commit
226e8896b6
@ -30,6 +30,13 @@ stored in Glance. This document shows you the steps to build the guest images.
|
||||
is created and registered in Glance automatically, unless it's disabled by
|
||||
setting ``TROVE_ENABLE_IMAGE_BUILD=false`` in devstack local.conf file.
|
||||
|
||||
Since Yoga release, Trove sets default use_nova_server_config_drive to
|
||||
``False``. This change will break instance provisioning in some cases.
|
||||
To avoid that, make sure your ``DIB_CLOUD_INIT_DATASOURCES`` environment
|
||||
contains ``OpenStack`` to configure cloud-init to use metadata serivce.
|
||||
If cloud-init still doesn't inject files after changing the environment,
|
||||
please ask your IaaS provider admin to enable OpenStack metadata service.
|
||||
|
||||
High Level Overview of a Trove Guest Instance
|
||||
=============================================
|
||||
|
||||
|
@ -988,7 +988,7 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin):
|
||||
|
||||
# Use config_drive instead by userdata
|
||||
# We will inject guest config by cloud-config
|
||||
if not config_drive:
|
||||
if files:
|
||||
if not userdata:
|
||||
userdata = self.prepare_cloud_config(files)
|
||||
else:
|
||||
|
Loading…
Reference in New Issue
Block a user