summaryrefslogtreecommitdiffstats
path: root/Vagrantfile
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-13 10:43:40 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-13 10:43:40 -0500
commitf7b535a898da05b84be3b93f16e2e7732f865c25 (patch)
treed72ddb1502b73d5c11f77ea23c6e896e24168812 /Vagrantfile
parent40385cc6c3ebcc6ac819d729124dab3e44d7dafa (diff)
parentf259b0192d1fa635c2bbf299b94555936d004be3 (diff)
downloadopenshift-f7b535a898da05b84be3b93f16e2e7732f865c25.tar.gz
openshift-f7b535a898da05b84be3b93f16e2e7732f865c25.tar.bz2
openshift-f7b535a898da05b84be3b93f16e2e7732f865c25.tar.xz
openshift-f7b535a898da05b84be3b93f16e2e7732f865c25.zip
Merge pull request #739 from codificat/vagrant-noregister
Vagrantfile cleanup: remove unnecessary RHEL registration and network workaround
Diffstat (limited to 'Vagrantfile')
-rw-r--r--Vagrantfile21
1 files changed, 0 insertions, 21 deletions
diff --git a/Vagrantfile b/Vagrantfile
index 33532cd63..362e1ff48 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -16,27 +16,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.hostmanager.include_offline = true
config.ssh.insert_key = false
- if deployment_type === 'enterprise'
- unless Vagrant.has_plugin?('vagrant-registration')
- raise 'vagrant-registration-plugin is required for enterprise deployment'
- end
- username = ENV['rhel_subscription_user']
- password = ENV['rhel_subscription_pass']
- unless username and password
- raise 'rhel_subscription_user and rhel_subscription_pass are required'
- end
- config.registration.username = username
- config.registration.password = password
- # FIXME this is temporary until vagrant/ansible registration modules
- # are capable of handling specific subscription pools
- if not ENV['rhel_subscription_pool'].nil?
- config.vm.provision "shell" do |s|
- s.inline = "subscription-manager attach --pool=$1 || true"
- s.args = "#{ENV['rhel_subscription_pool']}"
- end
- end
- end
-
config.vm.provider "virtualbox" do |vbox, override|
override.vm.box = "centos/7"
vbox.memory = 1024