github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #25985 from elsonrodriguez/openstack-provider-heatfix 

Automatic merge from submit-queue

Updating CentOS image, adding heat back to the required cli tools.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
Updated the CentOS cloudimage to the latest available, and also added heat to the required list of cli tools. This is an interim step to replacing all the commands with openstackclient.
pull/6/head
k8s-merge-robot 2016-05-20 17:57:22 -07:00
parent 12f7b81481 c65e5c2b90
commit ba959446f2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/openstack-heat/config-image.sh
View File

@ -20,7 +20,7 @@
OPENSTACK_IMAGE_NAME=${OPENSTACK_IMAGE_NAME:-CentOS7}
# Downloaded image name for Openstack project
IMAGE_FILE=${IMAGE_FILE:-CentOS-7-x86_64-GenericCloud-1510.qcow2}
IMAGE_FILE=${IMAGE_FILE:-CentOS-7-x86_64-GenericCloud-1604.qcow2}
# Absolute path where image file is stored.
IMAGE_PATH=${IMAGE_PATH:-~/Downloads/openstack}

2
cluster/openstack-heat/util.sh
View File

@ -32,7 +32,7 @@ fi
# Verify prereqs on host machine
function verify-prereqs() {
# Check the OpenStack command-line clients
for client in swift glance nova openstack;
for client in swift glance nova heat openstack;
do
if which $client >/dev/null 2>&1; then
echo "${client} client installed"