diff --git a/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb b/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb index d583322d6..1c29d7d6c 100644 --- a/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb +++ b/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner module Cap module Debian module DockerConfigureAutoStart diff --git a/plugins/provisioners/docker/cap/debian/docker_install.rb b/plugins/provisioners/docker/cap/debian/docker_install.rb index 07edb4651..0d376a243 100644 --- a/plugins/provisioners/docker/cap/debian/docker_install.rb +++ b/plugins/provisioners/docker/cap/debian/docker_install.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner module Cap module Debian module DockerInstall diff --git a/plugins/provisioners/docker/cap/debian/docker_start_service.rb b/plugins/provisioners/docker/cap/debian/docker_start_service.rb index a97bade8b..63c1e3183 100644 --- a/plugins/provisioners/docker/cap/debian/docker_start_service.rb +++ b/plugins/provisioners/docker/cap/debian/docker_start_service.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner module Cap module Debian module DockerStartService diff --git a/plugins/provisioners/docker/cap/linux/docker_configure_vagrant_user.rb b/plugins/provisioners/docker/cap/linux/docker_configure_vagrant_user.rb index e65a33d4f..7a3d87e94 100644 --- a/plugins/provisioners/docker/cap/linux/docker_configure_vagrant_user.rb +++ b/plugins/provisioners/docker/cap/linux/docker_configure_vagrant_user.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner module Cap module Linux module DockerConfigureVagrantUser diff --git a/plugins/provisioners/docker/cap/linux/docker_installed.rb b/plugins/provisioners/docker/cap/linux/docker_installed.rb index f5d693501..f1d05fa2f 100644 --- a/plugins/provisioners/docker/cap/linux/docker_installed.rb +++ b/plugins/provisioners/docker/cap/linux/docker_installed.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner module Cap module Linux module DockerInstalled diff --git a/plugins/provisioners/docker/cap/redhat/docker_configure_auto_start.rb b/plugins/provisioners/docker/cap/redhat/docker_configure_auto_start.rb index 696d946fc..aaae9d787 100644 --- a/plugins/provisioners/docker/cap/redhat/docker_configure_auto_start.rb +++ b/plugins/provisioners/docker/cap/redhat/docker_configure_auto_start.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner module Cap module Redhat module DockerConfigureAutoStart diff --git a/plugins/provisioners/docker/cap/redhat/docker_install.rb b/plugins/provisioners/docker/cap/redhat/docker_install.rb index a7374696d..a0ef03cb0 100644 --- a/plugins/provisioners/docker/cap/redhat/docker_install.rb +++ b/plugins/provisioners/docker/cap/redhat/docker_install.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner module Cap module Redhat module DockerInstall diff --git a/plugins/provisioners/docker/cap/redhat/docker_start_service.rb b/plugins/provisioners/docker/cap/redhat/docker_start_service.rb index 263b2c3ed..2e7662f00 100644 --- a/plugins/provisioners/docker/cap/redhat/docker_start_service.rb +++ b/plugins/provisioners/docker/cap/redhat/docker_start_service.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner module Cap module Redhat module DockerStartService diff --git a/plugins/provisioners/docker/client.rb b/plugins/provisioners/docker/client.rb index 75457a679..115231cde 100644 --- a/plugins/provisioners/docker/client.rb +++ b/plugins/provisioners/docker/client.rb @@ -1,7 +1,7 @@ require 'digest/sha1' module VagrantPlugins - module Docker + module DockerProvisioner class Client def initialize(machine) @machine = machine diff --git a/plugins/provisioners/docker/config.rb b/plugins/provisioners/docker/config.rb index e38d607b4..c96e97305 100644 --- a/plugins/provisioners/docker/config.rb +++ b/plugins/provisioners/docker/config.rb @@ -1,7 +1,7 @@ require 'set' module VagrantPlugins - module Docker + module DockerProvisioner class Config < Vagrant.plugin("2", :config) attr_reader :images attr_accessor :version diff --git a/plugins/provisioners/docker/installer.rb b/plugins/provisioners/docker/installer.rb index 8f2fbf2b0..01028f5c0 100644 --- a/plugins/provisioners/docker/installer.rb +++ b/plugins/provisioners/docker/installer.rb @@ -1,5 +1,5 @@ module VagrantPlugins - module Docker + module DockerProvisioner class Installer def initialize(machine, version) @machine = machine diff --git a/plugins/provisioners/docker/plugin.rb b/plugins/provisioners/docker/plugin.rb index 5a4019de0..c68e772e1 100644 --- a/plugins/provisioners/docker/plugin.rb +++ b/plugins/provisioners/docker/plugin.rb @@ -1,7 +1,7 @@ require "vagrant" module VagrantPlugins - module Docker + module DockerProvisioner class Plugin < Vagrant.plugin("2") name "docker" description <<-DESC diff --git a/plugins/provisioners/docker/provisioner.rb b/plugins/provisioners/docker/provisioner.rb index d378b2d9a..8b9d609a3 100644 --- a/plugins/provisioners/docker/provisioner.rb +++ b/plugins/provisioners/docker/provisioner.rb @@ -2,7 +2,7 @@ require_relative "client" require_relative "installer" module VagrantPlugins - module Docker + module DockerProvisioner class DockerError < Vagrant::Errors::VagrantError error_namespace("vagrant.provisioners.docker") end diff --git a/test/unit/plugins/provisioners/docker/config_test.rb b/test/unit/plugins/provisioners/docker/config_test.rb index 282e7af40..e34c24bba 100644 --- a/test/unit/plugins/provisioners/docker/config_test.rb +++ b/test/unit/plugins/provisioners/docker/config_test.rb @@ -2,7 +2,7 @@ require File.expand_path("../../../../base", __FILE__) require Vagrant.source_root.join("plugins/provisioners/docker/config") -describe VagrantPlugins::Docker::Config do +describe VagrantPlugins::DockerProvisioner::Config do subject { described_class.new } describe "#build_image" do