Merge pull request #13808 from derekwaynecarr/add_cockpit

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-17 08:36:34 -07:00
commit 37c4e2eba3
2 changed files with 23 additions and 2 deletions

View File

@ -254,6 +254,19 @@ pushd /kube-install
./kubernetes/saltbase/install.sh "${server_binary_tar##*/}"
popd
# Enable Fedora Cockpit on host to support Kubernetes administration
# Access it by going to <master-ip>:9090 and login as vagrant/vagrant
if ! which /usr/libexec/cockpit-ws &>/dev/null; then
pushd /etc/yum.repos.d
wget https://copr.fedoraproject.org/coprs/sgallagh/cockpit-preview/repo/fedora-21/sgallagh-cockpit-preview-fedora-21.repo
yum install -y cockpit cockpit-kubernetes
popd
systemctl enable cockpit.socket
systemctl start cockpit.socket
fi
# we will run provision to update code each time we test, so we do not want to do salt installs each time
if ! which salt-master &>/dev/null; then

View File

@ -260,13 +260,21 @@ function verify-cluster {
# ensures KUBECONFIG is set
get-kubeconfig-basicauth
echo
echo "Kubernetes cluster is running. The master is running at:"
echo "Kubernetes cluster is running."
echo
echo "The master is running at:"
echo
echo " https://${MASTER_IP}"
echo
echo "Administer and visualize its resources using Cockpit:"
echo
echo " https://${MASTER_IP}:9090"
echo
echo "For more information on Cockpit, visit http://cockpit-project.org"
echo
echo "The user name and password to use is located in ${KUBECONFIG}"
echo
)
)
}
# Instantiate a kubernetes cluster