diff --git a/site-modules/profile/files/cloud-init/modules.cfg b/site-modules/profile/files/cloud-init/modules.cfg
new file mode 100644
--- /dev/null
+++ b/site-modules/profile/files/cloud-init/modules.cfg
@@ -0,0 +1,20 @@
+# Managed by Puppet (class profile::cloud-int), changes will be lost.
+
+# The modules that run in the 'init' stage
+cloud_init_modules:
+ - migrator
+ - seed_random
+ - bootcmd
+ - write-files
+ - growpart
+ - resizefs
+ - disk_setup
+ - mounts
+ - set_hostname
+ - update_hostname
+# disable the /etc/hosts content management
+# - update_etc_hosts
+ - ca-certs
+ - rsyslog
+ - users-groups
+ - ssh
diff --git a/site-modules/profile/manifests/cloudinit.pp b/site-modules/profile/manifests/cloudinit.pp
new file mode 100644
--- /dev/null
+++ b/site-modules/profile/manifests/cloudinit.pp
@@ -0,0 +1,21 @@
+# Manage cloudinit configuration
+class profile::cloudinit {
+
+  # external fact installed by terraform
+  if $::cloudinit_enabled {
+    file { '/etc/cloud/cloud.cfg.d/99_modules.cfg':
+      ensure => present,
+      source => 'puppet:///modules/profile/cloud-init/modules.cfg',
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0644',
+      notify => Service['cloud-init'],
+    }
+
+    service { 'cloud-init':
+      ensure => running,
+      enable => true,
+    }
+  }
+
+}
diff --git a/site-modules/role/manifests/swh_base.pp b/site-modules/role/manifests/swh_base.pp
--- a/site-modules/role/manifests/swh_base.pp
+++ b/site-modules/role/manifests/swh_base.pp
@@ -16,6 +16,7 @@
     include profile::megacli
   }
 
+  include profile::cloudinit
   include profile::smartmontools
   include profile::network
   include profile::swh