Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refresh docker image definition
[releng/builder.git]
/
vagrant
/
docker
/
Vagrantfile
diff --git
a/vagrant/ovsdb-docker/Vagrantfile
b/vagrant/docker/Vagrantfile
similarity index 88%
rename from
vagrant/ovsdb-docker/Vagrantfile
rename to
vagrant/docker/Vagrantfile
index 8e543d5ef0a44679dcd8f8f708570dcdac0bbdb4..278a0581d9ac7aa4a5c8d7f4dcb1642d6538fe59 100644
(file)
--- a/
vagrant/ovsdb-docker/Vagrantfile
+++ b/
vagrant/docker/Vagrantfile
@@
-14,12
+14,6
@@
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# so use that
config.ssh.username = 'root'
# so use that
config.ssh.username = 'root'
- # Fedora and EL systems default to requiring tty for sudo
- # This should have been disabled with the Vagrant ready
- # base box conversion (see rackspace-convert-base vagrant)
- # but just to be safe
- config.ssh.pty = true
-
# make sure to set the following in your
# ~/.vagrant.d/boxes/dummy/0/rackspace/Vagrantfile
# rs.username
# make sure to set the following in your
# ~/.vagrant.d/boxes/dummy/0/rackspace/Vagrantfile
# rs.username