Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix recent setup failures. #102

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix recent setup failures. #102

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
990f908
Fix breaking issues in the build.
Apr 6, 2017
d9b0817
Move to the bento CentOS image instead of the old vagrant.o.o image.
Apr 7, 2017
f8ca62c
Simplify the vagrantfile.
Apr 7, 2017
4a9a5be
Remove box URL from Vagrantfile.
Apr 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

MOUNT_POINT = '/home/vagrant/ganeti_webmgr'

box_ver = "20140121"
box_url = "http://vagrant.osuosl.org/centos-6-#{box_ver}.box"

Vagrant.configure("2") do |config|
config.vm.hostname = "gwm.example.org"
config.vm.box = "centos-6-#{box_ver}"
config.vm.box_url = "#{box_url}"
config.vm.box = "bento/centos-6.8"
config.vm.box_url = "bento/centos-6.8"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed, the box above will automatically get it's url populated.


config.vm.provider 'virtualbox' do |v|
v.customize ['modifyvm', :id, '--cableconnected1', 'on']
end

config.vm.network :private_network, ip: "33.33.33.100", adapter: 2

Expand Down
1 change: 1 addition & 0 deletions chef/environments/vagrant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"host": "localhost",
"port": 3306
},
"path": "/home/vagrant/ganeti_webmgr",
"apache": {
"server_aliases": ["localhost"]
},
Expand Down
20 changes: 17 additions & 3 deletions scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,8 @@ check_if_exists "$venv"
if [ $upgrade -eq 0 ]; then
echo "Installing to: $install_directory"

${sudo} ${venv} --setuptools --no-site-packages "$install_directory"
${sudo} ${venv} --no-site-packages "$install_directory"
echo "Ran venv."
# check if virtualenv has succeeded
if [ ! $? -eq 0 ]; then
echo "${txtboldred}Something went wrong. Could not create virtual" \
Expand All @@ -294,10 +295,23 @@ else
# automatically.
fi

### updating pip and setuptools to the newest versions, installing wheel
### first install a local setuptools to bootstrap everything
python="/usr/bin/python"
${python} -m ensurepip --user
echo

### then install pip, which depends on setuptools, and can install the rest
pip="$install_directory/bin/pip"
check_if_exists "$pip"
${sudo} ${pip} install $pip_proxy --upgrade setuptools pip wheel
${sudo} ${pip} install ${pip_proxy} --upgrade pip
echo

### then install all of the dependencies of setuptools, which are cyclic
${sudo} ${pip} install ${pip_proxy} --upgrade appdirs six pyparsing packaging
echo

### setuptools to the newest version, installing wheel
${sudo} ${pip} install $pip_proxy --upgrade setuptools wheel
echo

# check if successfully upgraded pip and setuptools
Expand Down