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

WIP: Minor devstack plugin changes #53

Closed
wants to merge 1 commit into from
Closed

WIP: Minor devstack plugin changes #53

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
14 changes: 7 additions & 7 deletions devstack/plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/kubernetes/kubernetes}
K8S_SRC=${GOPATH}/src/k8s.io/kubernetes

function install_prereqs {
# Install pre-reqs
$BASE_DIR/tools/install-distro-packages.sh
# Install pre-reqs
$BASE_DIR/tools/test-setup.sh
$BASE_DIR/tools/install-distro-packages.sh

install_package nfs-common
}
Expand All @@ -41,9 +41,9 @@ function install_docker {
sudo cat /lib/systemd/system/docker.service
sudo sed -r -i "s|(ExecStart)=(.+)|\1=\2 --iptables=false|" /lib/systemd/system/docker.service
sudo cat /lib/systemd/system/docker.service
sudo systemctl daemon-reload
sudo systemctl restart docker
sudo systemctl status docker
sudo systemctl --no-pager daemon-reload
sudo systemctl --no-pager restart docker
sudo systemctl --no-pager status docker
Copy link
Contributor

Choose a reason for hiding this comment

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

The 'systemctl status' call was removed in PR #50, thats causing the merge conflict.

sudo ifconfig -a
fi
docker --version
Expand All @@ -53,8 +53,8 @@ function install_docker {
echo "K8S_VERSION : ${K8S_VERSION}"

echo "Starting docker service"
sudo systemctl enable docker.service
sudo systemctl start docker.service --ignore-dependencies
sudo systemctl --no-pager enable docker.service
sudo systemctl --no-pager start docker.service --ignore-dependencies
echo "Checking docker service"
sudo docker ps
}
Expand Down
3 changes: 1 addition & 2 deletions tools/install-distro-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ if ! which bindep; then
pushd $BASE_DIR >/dev/null
make bindep
popd >/dev/null
PACKAGES=$(make bindep || true)
fi

PACKAGES=$(make bindep || true)

# inspired from project-config install-distro-packages.sh
if apt-get -v >/dev/null 2>&1 ; then
sudo apt-get -qq update
Expand Down