mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #11469 from fredjean/fix-vagrant-vmware
Boot a Vagrant on VMWare Kubernetes Cluster
This commit is contained in:
commit
445fff030c
4
Vagrantfile
vendored
4
Vagrantfile
vendored
@ -74,8 +74,8 @@ $kube_provider_boxes = {
|
|||||||
},
|
},
|
||||||
:vmware_desktop => {
|
:vmware_desktop => {
|
||||||
'fedora' => {
|
'fedora' => {
|
||||||
:box_name => 'kube-fedora20',
|
:box_name => 'kube-fedora21',
|
||||||
:box_url => 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box'
|
:box_url => 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21_chef-provisionerless.box'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,9 +9,6 @@
|
|||||||
{% if grains.cloud == 'azure' %}
|
{% if grains.cloud == 'azure' %}
|
||||||
{% set cert_ip='_use_azure_dns_name_' %}
|
{% set cert_ip='_use_azure_dns_name_' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if grains.cloud == 'vagrant' %}
|
|
||||||
{% set cert_ip=grains.ip_interfaces.eth1[0] %}
|
|
||||||
{% endif %}
|
|
||||||
{% if grains.cloud == 'vsphere' %}
|
{% if grains.cloud == 'vsphere' %}
|
||||||
{% set cert_ip=grains.ip_interfaces.eth0[0] %}
|
{% set cert_ip=grains.ip_interfaces.eth0[0] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -28,11 +28,16 @@ if [[ "$(grep 'VERSION_ID' /etc/os-release)" =~ ^VERSION_ID=21 ]]; then
|
|||||||
|
|
||||||
# Disable network interface being managed by Network Manager (needed for Fedora 21+)
|
# Disable network interface being managed by Network Manager (needed for Fedora 21+)
|
||||||
NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
|
NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
|
||||||
grep -q ^NM_CONTROLLED= ${NETWORK_CONF_PATH}ifcfg-eth1 || echo 'NM_CONTROLLED=no' >> ${NETWORK_CONF_PATH}ifcfg-eth1
|
if_to_edit=$( find ${NETWORK_CONF_PATH}ifcfg-* | xargs grep -l VAGRANT-BEGIN )
|
||||||
sed -i 's/^#NM_CONTROLLED=.*/NM_CONTROLLED=no/' ${NETWORK_CONF_PATH}ifcfg-eth1
|
for if_conf in ${if_to_edit}; do
|
||||||
|
grep -q ^NM_CONTROLLED= ${if_conf} || echo 'NM_CONTROLLED=no' >> ${if_conf}
|
||||||
|
sed -i 's/#^NM_CONTROLLED=.*/NM_CONTROLLED=no/' ${if_conf}
|
||||||
|
done;
|
||||||
systemctl restart network
|
systemctl restart network
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
NETWORK_IF_NAME=`echo ${if_to_edit} | awk -F- '{ print $3 }'`
|
||||||
|
|
||||||
function release_not_found() {
|
function release_not_found() {
|
||||||
echo "It looks as if you don't have a compiled version of Kubernetes. If you" >&2
|
echo "It looks as if you don't have a compiled version of Kubernetes. If you" >&2
|
||||||
echo "are running from a clone of the git repo, please run 'make quick-release'." >&2
|
echo "are running from a clone of the git repo, please run 'make quick-release'." >&2
|
||||||
@ -95,7 +100,7 @@ grains:
|
|||||||
node_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
node_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
||||||
publicAddressOverride: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
publicAddressOverride: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
||||||
network_mode: openvswitch
|
network_mode: openvswitch
|
||||||
networkInterfaceName: eth1
|
networkInterfaceName: '$(echo "$NETWORK_IF_NAME" | sed -e "s/'/''/g")'
|
||||||
api_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
api_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
||||||
cloud: vagrant
|
cloud: vagrant
|
||||||
roles:
|
roles:
|
||||||
|
@ -79,11 +79,16 @@ if [[ "$(grep 'VERSION_ID' /etc/os-release)" =~ ^VERSION_ID=21 ]]; then
|
|||||||
|
|
||||||
# Disable network interface being managed by Network Manager (needed for Fedora 21+)
|
# Disable network interface being managed by Network Manager (needed for Fedora 21+)
|
||||||
NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
|
NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/
|
||||||
grep -q ^NM_CONTROLLED= ${NETWORK_CONF_PATH}ifcfg-eth1 || echo 'NM_CONTROLLED=no' >> ${NETWORK_CONF_PATH}ifcfg-eth1
|
if_to_edit=$( find ${NETWORK_CONF_PATH}ifcfg-* | xargs grep -l VAGRANT-BEGIN )
|
||||||
sed -i 's/^#NM_CONTROLLED=.*/NM_CONTROLLED=no/' ${NETWORK_CONF_PATH}ifcfg-eth1
|
for if_conf in ${if_to_edit}; do
|
||||||
|
grep -q ^NM_CONTROLLED= ${if_conf} || echo 'NM_CONTROLLED=no' >> ${if_conf}
|
||||||
|
sed -i 's/#^NM_CONTROLLED=.*/NM_CONTROLLED=no/' ${if_conf}
|
||||||
|
done;
|
||||||
systemctl restart network
|
systemctl restart network
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
NETWORK_IF_NAME=`echo ${if_to_edit} | awk -F- '{ print $3 }'`
|
||||||
|
|
||||||
# Setup hosts file to support ping by hostname to master
|
# Setup hosts file to support ping by hostname to master
|
||||||
if [ ! "$(cat /etc/hosts | grep $MASTER_NAME)" ]; then
|
if [ ! "$(cat /etc/hosts | grep $MASTER_NAME)" ]; then
|
||||||
echo "Adding $MASTER_NAME to hosts file"
|
echo "Adding $MASTER_NAME to hosts file"
|
||||||
@ -142,7 +147,7 @@ grains:
|
|||||||
network_mode: openvswitch
|
network_mode: openvswitch
|
||||||
node_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
|
node_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
|
||||||
api_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
api_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
||||||
networkInterfaceName: eth1
|
networkInterfaceName: '$(echo "$NETWORK_IF_NAME" | sed -e "s/'/''/g")'
|
||||||
roles:
|
roles:
|
||||||
- kubernetes-pool
|
- kubernetes-pool
|
||||||
cbr-cidr: '$(echo "$CONTAINER_SUBNET" | sed -e "s/'/''/g")'
|
cbr-cidr: '$(echo "$CONTAINER_SUBNET" | sed -e "s/'/''/g")'
|
||||||
|
Loading…
Reference in New Issue
Block a user