Skip to content

Make sure vagrant development environment works well with new docker-io #962

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

Merged
openshift-bot merged 1 commit into from
Feb 10, 2015
Merged

Make sure vagrant development environment works well with new docker-io #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion vagrant/provision-master.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ popd
# Start docker
systemctl enable docker.service
systemctl start docker.service
usermod -a -G docker vagrant

# Create systemd service
cat <<EOF > /usr/lib/systemd/system/openshift-master.service
[Unit]
Description=openshift master
Requires=docker.service
After=network.service

[Service]
Expand Down
3 changes: 1 addition & 2 deletions vagrant/provision-minion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ else
$(dirname $0)/provision-gre-network.sh $@
fi

usermod -a -G docker vagrant

# Copy over the certificates directory and modify the kubeconfig file to use the master ip
cp -r /vagrant/openshift.local.certificates /
chown -R vagrant.vagrant /openshift.local.certificates
Expand All @@ -50,6 +48,7 @@ sed -ie "s/10.0.2.15/${MASTER_IP}/g" /openshift.local.certificates/admin/.kubeco
cat <<EOF > /usr/lib/systemd/system/openshift-node.service
[Unit]
Description=openshift node
Requires=docker.service
After=network.service

[Service]
Expand Down