Merge "Add custom user_data content configuration for Bifrost"

ansible/inventory/group_vars/all/bifrost

@@ -68,6 +68,10 @@ kolla_bifrost_deploy_image_filename: "deployment_image.qcow2"
 # Default is none.
 kolla_bifrost_deploy_image_rootfs:
 
+# Custom cloud-init user-data passed to deploy of the deployment image.
+# Default is an empty string.
+kolla_bifrost_deploy_image_user_data_content: ''
+
 ###############################################################################
 # Ironic configuration.
 

ansible/kolla-bifrost-hostvars.yml

@@ -26,6 +26,7 @@
       ipv4_nameserver: "{{ resolv_nameservers }}"
       network_mtu: "{{ admin_oc_net_name | net_mtu or '1500' }}"
       vlan_id: "{{ '' if admin_oc_net_name == provision_oc_net_name else (admin_oc_net_name | net_vlan) }}"
+      user_data_content: "{{ kolla_bifrost_deploy_image_user_data_content }}"
   tasks:
     - block:
         - name: Ensure the Bifrost host variables directory exists

doc/source/configuration/reference/bifrost.rst

@@ -195,6 +195,24 @@ The name of the root disk image to deploy can be configured via the
 Kayobe inventory. This can be used to provision different images across the
 overcloud.
 
+It can be necessary to deploy overcloud hosts with custom settings which can be
+configured during provision by the cloud-init user-data configured via the
+``kolla_bifrost_deploy_image_user_data_content`` option. The defaults is an
+empty string.
+
+.. code-block:: yaml
+   :caption: ``bifrost.yml``
+
+   kolla_bifrost_deploy_image_user_data_content: |
+     users:
+       name: myuser
+       sudo: ALL=(ALL) NOPASSWD:ALL
+       shell: /bin/bash
+       passwd: <HASH_OF_MY_PASSWORD>
+       lock_passwd: false
+
+     timezone: "Europe/Paris"
+
 While only a single disk image can be built with Bifrost, starting from the
 Yoga 12.0.0 release, Kayobe supports building multiple disk images directly
 through Diskimage builder. Consult the :ref:`overcloud host disk image build

etc/kayobe/bifrost.yml

@@ -69,6 +69,10 @@
 # Default is none.
 #kolla_bifrost_deploy_image_rootfs:
 
+# Custom cloud-init user-data passed to deploy of the deployment image.
+# Default is an empty string.
+#kolla_bifrost_deploy_image_user_data_content:
+
 ###############################################################################
 # Ironic configuration.
 

releasenotes/notes/add-custom-user-data-content-d188c7c197b50acb.yaml

+---
+features:
+  - |
+    Adds a new ``kolla_bifrost_deploy_image_user_data_content`` variable used
+    to define the custom user_data content used by the cloud-init for overcloud
+    provision.