Fixes for nodo::role::dev::drupal8::composer

diff --git a/manifests/role/dev/drupal8.pp b/manifests/role/dev/drupal8.pp
index 9beee2ed0e561825b3b58e4d6d01f417402676ce..0a31217f3cbb1ebaf0256ce7ec00917afbd5bf39 100644 (file)
--- a/manifests/role/dev/drupal8.pp
+++ b/manifests/role/dev/drupal8.pp
@@ -1,13 +1,15 @@
 #
 # Class for a Drupal 8 development website
 #
-class nodo::role::dev::drupal8 inherits nodo::role::dev::drupal8::base (
+class nodo::role::dev::drupal8(
   $project        = 'drupal',
   $project_folder = '/srv/shared', # '/vagrant', '/srv/kvmx'
   $project_user   = 'user',        # 'vagrant'
   $db_name        = 'drupal',
   $db_password    = 'hackme',
 ) {
+  include nodo::role::dev::drupal8::base
+
   # Do not use this password on production machines
   database::instance { $db_name:
     password => $db_password,

diff --git a/manifests/role/dev/drupal8/composer.pp b/manifests/role/dev/drupal8/composer.pp
index b27e980de93d89582955fae5a302b995f28e6ec2..ea7b89522555c35fc7a74bb6a14637d2fced2864 100644 (file)
--- a/manifests/role/dev/drupal8/composer.pp
+++ b/manifests/role/dev/drupal8/composer.pp
@@ -1,13 +1,15 @@
 #
 # Class for a Drupal 8 development website using drupal-composer
 #
-class nodo::role::dev::drupal8::composer inherits nodo::role::dev::drupal8::base (
+class nodo::role::dev::drupal8::composer(
   $project        = 'drupal',
   $project_folder = '/srv/shared', # '/vagrant', '/srv/kvmx'
   $project_user   = 'user',        # 'vagrant'
   $db_name        = 'drupal',
   $db_password    = 'hackme',
 ) {
+  include nodo::role::dev::drupal8::base
+
   # Do not use this password on production machines
   database::instance { $db_name:
     password => $db_password,