beaker 2.2.0 → 2.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODAwM2ViN2UzMjliZTZhNTMzZWNjZGIyNDM3YWE0MjExMjRlYWQyYQ==
+    ZjZjMDRmZTM0YjZiNDcyYmQ1M2FhZjJmOTk5NTM3YTVmOWRhODkxMA==
   data.tar.gz: !binary |-
-    YTlhYjdkZDFjNGZiNjExYzMzZGUwYmUzYTM5NDZmOTE1Zjk0OGQxNg==
+    YWQwNTBlZDExNGZiZWRkMmUxZjk2YjgxYTZiODA3N2NiYmJmYTc5Ng==
 SHA512:
   metadata.gz: !binary |-
-    ZjQyYWM5YzE2ZTYwNjIxYjA1ZDFiYWU0MTI1OTIxMGE0MzRhZWQxYzk1ZWMw
-    NGQ3MjYzNTcxOTllMWY0NzVhN2I0YTBiZGM1MzY2MzcyNzA4NDRlNGQxZmRk
-    MTUzNTYwYTYxNTM1YzgyMTIwMzFiNjQzYjU0ZGVlYTFhOTczYjE=
+    MWQ2Yjc3ZDIzODAzMWViNTc5YmUxMmUyNjU0MWUyY2FkOTcwNzMyNTU4NjEx
+    NDQ3NTU5YTZjZDE1ZmMzYzExM2Y4MTFjMjMyMjRmMjNjZDljY2IzOGM2NWI1
+    NWMwMGU2ZDI2YTRjZTI0NzJiYWY1MTZhY2YxN2I1ZTI3MjVmZWY=
   data.tar.gz: !binary |-
-    ZmNiMTRhZmE0YTA3NzNlZWVkODE4ZmIwYTBhZDA1YmYyZGU1MTJjNWZjMTFh
-    M2I2OGI5MjU3ZTE1MTBhMzc1MjVhMWE1M2IyMjRmN2Q4NGYzMzc1MjNmODBk
-    MjRjN2QwNGI2YTk3NmU2NTkxODY4NDZkMTI5YjA2MWYzMGFhNTA=
+    MDM5N2I3YTE3MzViOWQ3MGUxZGNlYWE5YjEwMjE1ZTA3NjMzMjgwZWIwYWFi
+    ZjFiNTkwYjk0ZTY4NDdmNGZjMDJkMWM5ZTU4NTQ4YWRhNWU2ZTY2ZjBiMTA4
+    YjgzYWM4MGI0OTEzNDU0NDMwZDgxM2ZkMmEzOWI2ZWUwM2IwNTM=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 8 Jan, 2015 (4dde5f3a)](#LATEST)
+* [LATEST - 29 Jan, 2015 (41028a79)](#LATEST)
+* [beaker2.2.0 - 8 Jan, 2015 (cba5f7ed)](#beaker2.2.0)
 * [beaker2.1.0 - 17 Dec, 2014 (ec089b1a)](#beaker2.1.0)
 * [beaker2.0.0 - 5 Dec, 2014 (fb4b620b)](#beaker2.0.0)
 * [beaker1.20.1 - 17 Oct, 2014 (be250ad6)](#beaker1.20.1)
@@ -67,7 +68,224 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 8 Jan, 2015 (4dde5f3a)
+### <a name = "LATEST">LATEST - 29 Jan, 2015 (41028a79)
+
+* (GEM) update beaker version to 2.3.0 (41028a79)
+
+* Merge pull request #644 from electrical/hiera_config (420b01f2)
+
+
+```
+Merge pull request #644 from electrical/hiera_config
+
+Add helper function to write hiera.yaml file
+```
+* Merge pull request #631 from mcanevet/feature/no_sync_folder (2920fe63)
+
+
+```
+Merge pull request #631 from mcanevet/feature/no_sync_folder
+
+(GH-630) Add synced_folder option
+```
+* Merge pull request #645 from kevpl/qeng1714_aio_masterrolepaths (b825c65a)
+
+
+```
+Merge pull request #645 from kevpl/qeng1714_aio_masterrolepaths
+
+(QENG-1714) fixed get_type for a machine with only non-agent roles
+```
+* (QENG-1714) fixed non-agent AIO path issue (eacd3d31)
+
+* Merge pull request #657 from mcanevet/fix/el (25296221)
+
+
+```
+Merge pull request #657 from mcanevet/fix/el
+
+(gh-656) fix "sudo: sorry, you must have a tty to run sudo"
+```
+* (gh-656) fix "sudo: sorry, you must have a tty to run sudo" (0cde5cc7)
+
+* Merge pull request #649 from branan/maint (60993e0c)
+
+
+```
+Merge pull request #649 from branan/maint
+
+(maint) Fix options access in PE 3.7 answers gen on upgrades
+```
+* (maint) Fix options access in PE 3.7 answers gen on upgrades (673015be)
+
+* Merge pull request #638 from kevpl/qeng1690_aio_installpackages (c9535a35)
+
+
+```
+Merge pull request #638 from kevpl/qeng1690_aio_installpackages
+
+(QENG-1690) added in helper installation method for packages
+```
+* Add helper functions to manage hiera config and data files (c464f5f6)
+
+
+```
+Add helper functions to manage hiera config and data files
+
+- Added helper functions to manage hiera.yaml config file.
+- Added helper functions to copy over hiera data files.
+```
+* Merge pull request #640 from petems/QENG-1695-improve_osx_support (5b050f6c)
+
+
+```
+Merge pull request #640 from petems/QENG-1695-improve_osx_support
+
+(QENG-1695) Improves OSX Support
+```
+* (QENG-1690) added in helper installation method for packages (bba212cf)
+
+
+```
+(QENG-1690) added in helper installation method for packages
+
+I had misunderstood the install_puppetlabs_dev_repo method before, thinking that it would install packages
+from within the dev repo, but it's actually just installing the dev repo itself.  These changes add a
+corresponding installation method to install the packages found in these repos after they've been installed
+```
+* (QENG-1695) Improves OSX Support (9f78eeed)
+
+
+```
+(QENG-1695) Improves OSX Support
+
+* Fixes for root key location copy
+* Adds a Vagrant VB OSX option
+* Fixes PermitRootLogin regex
+* Adds option to enable GUI
+* Raises error if version not given for DMG
+
+Now works with an example OSX Virtualbox image :+1:
+```
+* Merge pull request #621 from stefanmortensen/fix_root_login (a5d4d9b4)
+
+
+```
+Merge pull request #621 from stefanmortensen/fix_root_login
+
+(gh-620) Enable root if user is not root for the OpenStack hypervisor
+```
+* Merge pull request #622 from doug-rosser/volume_size (76b8def6)
+
+
+```
+Merge pull request #622 from doug-rosser/volume_size
+
+(QENG-1676) Enable root volume size changes with volume_size in the config file
+```
+* Merge pull request #564 from mcanevet/fix/openstack_hypervisor (7c1c52b1)
+
+
+```
+Merge pull request #564 from mcanevet/fix/openstack_hypervisor
+
+(GH-632) Fix Network creation
+```
+* Merge pull request #636 from branan/lol_old_el (e7545fa0)
+
+
+```
+Merge pull request #636 from branan/lol_old_el
+
+(QENG-1684) Allow exit code of '1' when stopping puppet agent on centos4
+```
+* (QENG-1684) Allow exit code of '1' when stopping puppet agent on centos4 (589ea1e1)
+
+
+```
+(QENG-1684) Allow exit code of '1' when stopping puppet agent on centos4
+
+When upgrading, the agent service is already stopped. On Centos4, this
+causes a failure from the init script. We want to ignore that failure.
+```
+* (GH-630) Add synced_folder option (619ead3d)
+
+* Merge pull request #597 from kevpl/qeng144_masterless_supportadd (7c88b74a)
+
+
+```
+Merge pull request #597 from kevpl/qeng144_masterless_supportadd
+
+(QENG-144) created masterless option, and support for masterless installs
+```
+* (QENG-1676) Enable root volume size changes with volume_size in the config file (f62ba27d)
+
+* Merge pull request #614 from anodelman/aws (981ab44d)
+
+
+```
+Merge pull request #614 from anodelman/aws
+
+(QENG-1662) beaker smoketests failing on ec2 with security group error
+```
+* (gh-620) Enable root if user is not root for the OpenStack hypervisor (3062d505)
+
+* (QENG-1662) beaker smoketests failing on ec2 with security group error (9948ff49)
+
+
+```
+(QENG-1662) beaker smoketests failing on ec2 with security group error
+
+- ensure when looking for an appropriate security group that you are
+  looking in a) the provided vpc, b) in the default vpc or c) the
+  appropriate region if no default vpc is defined - do not allow
+  a mix of vpcs.
+```
+* Merge pull request #602 from er0ck/feature/master/QENG-1628-add_bash_completion_scripts_for_beaker (1d6c9437)
+
+
+```
+Merge pull request #602 from er0ck/feature/master/QENG-1628-add_bash_completion_scripts_for_beaker
+
+(QENG-1628) Add bash completion scripts for beaker
+```
+* Merge pull request #604 from kevpl/qeng1631_eos_successfail (d93961d8)
+
+
+```
+Merge pull request #604 from kevpl/qeng1631_eos_successfail
+
+(QENG-1631) allowed exit code 0 for puppet agent call for EOS during install
+```
+* Merge pull request #610 from electrical/vagrant_stderr (1c2e33d4)
+
+
+```
+Merge pull request #610 from electrical/vagrant_stderr
+
+Add stderr output to stacktrace
+```
+* (QENG-1631) allowed exit code 0 for puppet agent call for EOS during install (8b466d81)
+
+* (MAINT) Add stderr output to stacktrace (f43a94c4)
+
+* (QENG-1628) Add bash completion scripts for beaker (a71896b4)
+
+
+```
+(QENG-1628) Add bash completion scripts for beaker
+
+using this script, one can press tab after any portion (or none)
+of a beaker option/command and bash will complete it or offer
+suggestions.
+```
+* (QENG-144) created masterless option, and support for masterless installs (57391c27)
+
+* (GH-632) Fix Network creation (3ffff71e)
+
+### <a name = "beaker2.2.0">beaker2.2.0 - 8 Jan, 2015 (cba5f7ed)
+
+* (HISTORY) update beaker history for gem release 2.2.0 (cba5f7ed)
 
 * (GEM) update beaker version to 2.2.0 (4dde5f3a)
 
@@ -363,10 +581,10 @@ Once that was fixed, beaker worked.
 ```
 * (gh-568) Throw descriptive exception when no snapshot exists (2496a73e)
 
-* (gh-568) Allow snapshot option to be optional (d7b6d4e6)
-
 * (gh-568) Allow snapshot option to be optional (838709b5)
 
+* (gh-568) Allow snapshot option to be optional (d7b6d4e6)
+
 * (MAINT) exclude copying vendor dir to clients (5fec6251)
 
 * (QENG-1562) added AIO installation support for yum/apt on FOSS (eb4528c5)

data/ext/completion/beaker-completion.bash

@@ -0,0 +1,53 @@
+## bash completion script for beaker
+
+# The contained completion routines provide support for completing:
+#
+#    *) any option specified in beaker --help
+#       but not yet the arguments to the options
+
+# To use these routines:
+#
+#    1) Copy this file to somewhere (e.g. ~/.beaker-completion.sh).
+#    2) Add the following line to your .bashrc/.zshrc:
+#        source ~/.beaker-completion.sh
+#    3) tab will now complete beaker's command line options
+
+_beaker_complete()
+{
+    # COMP_WORDS is an array of words in the current command line.
+    # COMP_CWORD is the index of the current word (the one the cursor is
+    # in). So COMP_WORDS[COMP_CWORD] is the current word; we also record
+    # the previous word here, although this specific script doesn't
+    # use it yet.
+    local cur_word="${COMP_WORDS[COMP_CWORD]}"
+    local prev_word="${COMP_WORDS[COMP_CWORD-1]}"
+
+    # Ask beaker to generate a list of args
+    #   ensure other warnings/errors on stderr go to null
+    local beaker_help=`beaker --help 2>/dev/null`
+
+    # parse out commands and switches
+    # grep extended regex, only print match
+    local dash_words=`echo "${beaker_help}" | grep -oE ' \-(\w|\[|\]|-)+' | uniq`
+    # parse for negated commands
+    local negative_words=`echo "${dash_words}" | grep -oE '\-\-\[\w+-\](\w|-)+' | sed 's/\[//' | sed 's/\]//'`
+    # remove the negative portion from dash_words
+    local dash_words=`echo "${dash_words}" | sed 's/\[no\-\]//g'`
+
+    # TODO:
+    # Parse out arguments to commands
+    # Perform completion if the previous word is doubledash option and current word in argslist,
+
+    # Perform completion if the current word starts with a dash ('-'),
+    if [[ ${cur_word} == -* ]] ; then
+        # COMPREPLY is the array of possible completions, generated with
+        # the compgen builtin.
+        COMPREPLY=( $(compgen -W "${dash_words} ${negative_words}" -- ${cur_word}) )
+    else
+        COMPREPLY=()
+    fi
+    return 0
+}
+
+# Register _beaker_complete to provide completion for the following commands
+complete -F _beaker_complete beaker pe-beaker

data/lib/beaker/answers/version30.rb

@@ -15,6 +15,7 @@ module Beaker
     def host_answers(host, master, database, dashboard, options)
       # Windows hosts don't have normal answers...
       return nil if host['platform'] =~ /windows/
+      masterless = options[:masterless]
 
       # Everything's an agent
       agent_a = {
@@ -23,7 +24,6 @@ module Beaker
         :q_verify_packages => options[:answers][:q_verify_packages],
         :q_puppet_symlinks_install => 'y',
         :q_puppetagent_certname => host,
-        :q_puppetagent_server => master,
 
         # Disable database, console, and master by default
         # This will be overridden by other blocks being merged in.
@@ -33,6 +33,8 @@ module Beaker
         :q_puppetdb_install => 'n',
         :q_database_install => 'n',
       }
+      agent_a[:q_puppetagent_server] = masterless ? host : master
+      agent_a[:q_continue_or_reenter_master_hostname] = 'c' if masterless
 
       # These base answers are needed by all
       common_a = {
@@ -40,98 +42,100 @@ module Beaker
         :q_vendor_packages_install => 'y',
       }
 
-      # master/database answers
-      master_database_a = {
-        :q_puppetmaster_certname => master
-      }
-
-      # Master/dashboard answers
-      master_console_a = {
-        :q_puppetdb_hostname => database,
-        :q_puppetdb_port => answer_for(options, :q_puppetdb_port, 8081)
-      }
-
-      # Master only answers
-      master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
-      master_a = {
-        :q_puppetmaster_install => 'y',
-        :q_puppetmaster_dnsaltnames => master_dns_altnames,
-        :q_puppetmaster_enterpriseconsole_hostname => dashboard,
-        :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
-      }
-
-      # Common answers for console and database
-      database_name = answer_for(options, :q_puppetdb_database_name, 'pe-puppetdb')
-      database_user = answer_for(options, :q_puppetdb_database_user, 'mYpdBu3r')
-      dashboard_password = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_password]}'"
-      puppetdb_password = "'#{options[:answers][:q_puppetdb_password]}'"
-      auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
-      auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
-      console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
-      console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
-      database_port = answer_for(options, :q_database_port, 5432)
-
-      console_database_a = {
-        :q_puppetdb_database_name => database_name,
-        :q_puppetdb_database_user => database_user,
-        :q_puppetdb_database_password => puppetdb_password,
-        :q_puppet_enterpriseconsole_auth_database_name => auth_database_name,
-        :q_puppet_enterpriseconsole_auth_database_user => auth_database_user,
-        :q_puppet_enterpriseconsole_auth_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_database_name => console_database_name,
-        :q_puppet_enterpriseconsole_database_user => console_database_user,
-        :q_puppet_enterpriseconsole_database_password => dashboard_password,
-
-        :q_database_host => database,
-        :q_database_port => database_port,
-      }
-
-      # Console only answers
-      dashboard_user = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_user_email]}'"
-
-
-      smtp_host = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_host] || dashboard}'"
-      smtp_port = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_port]}'"
-      smtp_username = options[:answers][:q_puppet_enterpriseconsole_smtp_username]
-      smtp_password = options[:answers][:q_puppet_enterpriseconsole_smtp_password]
-      smtp_use_tls = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_use_tls]}'"
-      console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
-      console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
-
-      console_a = {
-        :q_puppet_enterpriseconsole_install => 'y',
-        :q_puppet_enterpriseconsole_inventory_hostname => host,
-        :q_puppet_enterpriseconsole_inventory_certname => host,
-        :q_puppet_enterpriseconsole_inventory_dnsaltnames => dashboard,
-        :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-        :q_puppet_enterpriseconsole_master_hostname => master,
-
-        :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
-        :q_puppet_enterpriseconsole_auth_password => dashboard_password,
-
-        :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
-
-        :q_puppet_enterpriseconsole_smtp_host => smtp_host,
-        :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
-        :q_puppet_enterpriseconsole_smtp_port => smtp_port,
-      }
+      unless masterless
+        # master/database answers
+        master_database_a = {
+          :q_puppetmaster_certname => master
+        }
+
+        # Master/dashboard answers
+        master_console_a = {
+          :q_puppetdb_hostname => database,
+          :q_puppetdb_port => answer_for(options, :q_puppetdb_port, 8081)
+        }
+
+        # Master only answers
+        master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
+        master_a = {
+          :q_puppetmaster_install => 'y',
+          :q_puppetmaster_dnsaltnames => master_dns_altnames,
+          :q_puppetmaster_enterpriseconsole_hostname => dashboard,
+          :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
+        }
+
+        # Common answers for console and database
+        database_name = answer_for(options, :q_puppetdb_database_name, 'pe-puppetdb')
+        database_user = answer_for(options, :q_puppetdb_database_user, 'mYpdBu3r')
+        dashboard_password = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_password]}'"
+        puppetdb_password = "'#{options[:answers][:q_puppetdb_password]}'"
+        auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
+        auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
+        console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
+        console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
+        database_port = answer_for(options, :q_database_port, 5432)
+
+        console_database_a = {
+          :q_puppetdb_database_name => database_name,
+          :q_puppetdb_database_user => database_user,
+          :q_puppetdb_database_password => puppetdb_password,
+          :q_puppet_enterpriseconsole_auth_database_name => auth_database_name,
+          :q_puppet_enterpriseconsole_auth_database_user => auth_database_user,
+          :q_puppet_enterpriseconsole_auth_database_password => dashboard_password,
+          :q_puppet_enterpriseconsole_database_name => console_database_name,
+          :q_puppet_enterpriseconsole_database_user => console_database_user,
+          :q_puppet_enterpriseconsole_database_password => dashboard_password,
+
+          :q_database_host => database,
+          :q_database_port => database_port,
+        }
+
+        # Console only answers
+        dashboard_user = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_user_email]}'"
+
+
+        smtp_host = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_host] || dashboard}'"
+        smtp_port = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_port]}'"
+        smtp_username = options[:answers][:q_puppet_enterpriseconsole_smtp_username]
+        smtp_password = options[:answers][:q_puppet_enterpriseconsole_smtp_password]
+        smtp_use_tls = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_use_tls]}'"
+        console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
+        console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
+
+        console_a = {
+          :q_puppet_enterpriseconsole_install => 'y',
+          :q_puppet_enterpriseconsole_inventory_hostname => host,
+          :q_puppet_enterpriseconsole_inventory_certname => host,
+          :q_puppet_enterpriseconsole_inventory_dnsaltnames => dashboard,
+          :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
+          :q_puppet_enterpriseconsole_master_hostname => master,
+
+          :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
+          :q_puppet_enterpriseconsole_auth_password => dashboard_password,
+
+          :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
+
+          :q_puppet_enterpriseconsole_smtp_host => smtp_host,
+          :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
+          :q_puppet_enterpriseconsole_smtp_port => smtp_port,
+        }
+
+        if smtp_password and smtp_username
+          console_a.merge!({
+                             :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
+                             :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
+                             :q_puppet_enterpriseconsole_smtp_user_auth => 'y'
+                           })
+        end
 
-      if smtp_password and smtp_username
-        console_a.merge!({
-                           :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
-                           :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
-                           :q_puppet_enterpriseconsole_smtp_user_auth => 'y'
-                         })
+        # Database only answers
+        database_a = {
+          :q_puppetdb_install => 'y',
+          :q_database_install => 'y',
+          :q_database_root_password => "'#{answer_for(options, :q_database_root_password, '=ZYdjiP3jCwV5eo9s1MBd')}'",
+          :q_database_root_user => answer_for(options, :q_database_root_user, 'pe-postgres'),
+        }
       end
 
-      # Database only answers
-      database_a = {
-        :q_puppetdb_install => 'y',
-        :q_database_install => 'y',
-        :q_database_root_password => "'#{answer_for(options, :q_database_root_password, '=ZYdjiP3jCwV5eo9s1MBd')}'",
-        :q_database_root_user => answer_for(options, :q_database_root_user, 'pe-postgres'),
-      }
-
       # Special answers for special hosts
       aix_a = {
         :q_run_updtvpkg => 'y',
@@ -193,9 +197,10 @@ module Beaker
     #   data.
     def generate_answers
       the_answers = {}
-      database = only_host_with_role(@hosts, 'database')
-      dashboard = only_host_with_role(@hosts, 'dashboard')
-      master = only_host_with_role(@hosts, 'master')
+      masterless  = @options[:masterless]
+      database    = masterless ? nil : only_host_with_role(@hosts, 'database')
+      dashboard   = masterless ? nil : only_host_with_role(@hosts, 'dashboard')
+      master      = masterless ? nil : only_host_with_role(@hosts, 'master')
       @hosts.each do |h|
         if @options[:type] == :upgrade and h[:pe_ver] =~ /\A3.0/
           # 3.0.x to 3.0.x should require no answers