diff options
-rw-r--r-- | doc/source/admin/building_guest_images.rst | 7 | ||||
-rwxr-xr-x | trove/taskmanager/models.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/source/admin/building_guest_images.rst b/doc/source/admin/building_guest_images.rst index ce56520a..8192b679 100644 --- a/doc/source/admin/building_guest_images.rst +++ b/doc/source/admin/building_guest_images.rst @@ -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 ============================================= diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index 134aecb5..58dd8f2b 100755 --- a/trove/taskmanager/models.py +++ b/trove/taskmanager/models.py @@ -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: |