github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-18 16:21:13 +00:00
Code Issues Projects Releases Wiki Activity

Replace heat client to openstack to avoid warnings

Browse Source
This commit is contained in:
Lukasz Zajaczkowski 2016-04-27 13:06:46 +02:00
parent c5ca66b2e1
commit 5f929d2a4c
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ fi
# Verify prereqs on host machine # Verify prereqs on host machine
function verify-prereqs() { function verify-prereqs() {
# Check the OpenStack command-line clients # Check the OpenStack command-line clients
for client in swift glance nova heat; for client in swift glance nova openstack;
do do
if which $client >/dev/null 2>&1; then if which $client >/dev/null 2>&1; then
echo "${client} client installed" echo "${client} client installed"
@ -61,7 +61,7 @@ function kube-up() {
function validate-cluster() { function validate-cluster() {
while (( --$STACK_CREATE_TIMEOUT >= 0)) ;do while (( --$STACK_CREATE_TIMEOUT >= 0)) ;do
local status=$(heat stack-show "${STACK_NAME}" | awk '$2=="stack_status" {print $4}') local status=$(openstack stack show "${STACK_NAME}" | awk '$2=="stack_status" {print $4}')
if [[ $status ]]; then if [[ $status ]]; then
echo "Cluster status ${status}" echo "Cluster status ${status}"
if [ $status = "CREATE_COMPLETE" ]; then if [ $status = "CREATE_COMPLETE" ]; then
@ -145,7 +145,7 @@ function add-keypair() {
# OPENSTACK_IMAGE_NAME # OPENSTACK_IMAGE_NAME
function create-glance-image() { function create-glance-image() {
if [[ ${CREATE_IMAGE} == "true" ]]; then if [[ ${CREATE_IMAGE} == "true" ]]; then
local image_status=$(nova image-show ${OPENSTACK_IMAGE_NAME} | awk '$2=="id" {print $4}') local image_status=$(openstack image show ${OPENSTACK_IMAGE_NAME} | awk '$2=="id" {print $4}')
if [[ ! $image_status ]]; then if [[ ! $image_status ]]; then
if [[ "${DOWNLOAD_IMAGE}" == "true" ]]; then if [[ "${DOWNLOAD_IMAGE}" == "true" ]]; then
@ -180,12 +180,12 @@ function create-glance-image() {
# STACK_NAME # STACK_NAME
function run-heat-script() { function run-heat-script() {
local stack_status=$(heat stack-show ${STACK_NAME}) local stack_status=$(openstack stack show ${STACK_NAME})
local swift_repo_url="${SWIFT_SERVER_URL}/v1/AUTH_${SWIFT_PROJECT_ID}/kubernetes" local swift_repo_url="${SWIFT_SERVER_URL}/v1/AUTH_${SWIFT_PROJECT_ID}/kubernetes"
if [ $CREATE_IMAGE = true ]; then if [ $CREATE_IMAGE = true ]; then
echo "[INFO] Retrieve new image ID" echo "[INFO] Retrieve new image ID"
IMAGE_ID=$(nova image-show ${OPENSTACK_IMAGE_NAME} | awk '$2=="id" {print $4}') IMAGE_ID=$(openstack image show ${OPENSTACK_IMAGE_NAME} | awk '$2=="id" {print $4}')
echo "[INFO] Image Id ${IMAGE_ID}" echo "[INFO] Image Id ${IMAGE_ID}"
fi fi
@ -193,34 +193,34 @@ function run-heat-script() {
echo "[INFO] Create stack ${STACK_NAME}" echo "[INFO] Create stack ${STACK_NAME}"
( (
cd ${ROOT}/kubernetes-heat cd ${ROOT}/kubernetes-heat
heat --api-timeout 60 stack-create \ openstack stack create --timeout 60 \
-P external_network=${EXTERNAL_NETWORK} \ --parameter external_network=${EXTERNAL_NETWORK} \
-P ssh_key_name=${KUBERNETES_KEYPAIR_NAME} \ --parameter ssh_key_name=${KUBERNETES_KEYPAIR_NAME} \
-P server_image=${IMAGE_ID} \ --parameter server_image=${IMAGE_ID} \
-P master_flavor=${MASTER_FLAVOR} \ --parameter master_flavor=${MASTER_FLAVOR} \
-P minion_flavor=${MINION_FLAVOR} \ --parameter minion_flavor=${MINION_FLAVOR} \
-P number_of_minions=${NUMBER_OF_MINIONS} \ --parameter number_of_minions=${NUMBER_OF_MINIONS} \
-P max_number_of_minions=${MAX_NUMBER_OF_MINIONS} \ --parameter max_number_of_minions=${MAX_NUMBER_OF_MINIONS} \
-P dns_nameserver=${DNS_SERVER} \ --parameter dns_nameserver=${DNS_SERVER} \
-P kubernetes_salt_url=${swift_repo_url}/kubernetes-salt.tar.gz \ --parameter kubernetes_salt_url=${swift_repo_url}/kubernetes-salt.tar.gz \
-P kubernetes_server_url=${swift_repo_url}/kubernetes-server.tar.gz \ --parameter kubernetes_server_url=${swift_repo_url}/kubernetes-server.tar.gz \
-P os_auth_url=${OS_AUTH_URL} \ --parameter os_auth_url=${OS_AUTH_URL} \
-P os_username=${OS_USERNAME} \ --parameter os_username=${OS_USERNAME} \
-P os_password=${OS_PASSWORD} \ --parameter os_password=${OS_PASSWORD} \
-P os_region_name=${OS_REGION_NAME} \ --parameter os_region_name=${OS_REGION_NAME} \
-P os_tenant_id=${OS_TENANT_ID} \ --parameter os_tenant_id=${OS_TENANT_ID} \
-P enable_proxy=${ENABLE_PROXY} \ --parameter enable_proxy=${ENABLE_PROXY} \
-P ftp_proxy="${FTP_PROXY}" \ --parameter ftp_proxy="${FTP_PROXY}" \
-P http_proxy="${HTTP_PROXY}" \ --parameter http_proxy="${HTTP_PROXY}" \
-P https_proxy="${HTTPS_PROXY}" \ --parameter https_proxy="${HTTPS_PROXY}" \
-P socks_proxy="${SOCKS_PROXY}" \ --parameter socks_proxy="${SOCKS_PROXY}" \
-P no_proxy="${NO_PROXY}" \ --parameter no_proxy="${NO_PROXY}" \
--template-file kubecluster.yaml \ --template kubecluster.yaml \
${STACK_NAME} ${STACK_NAME}
) )
else else
echo "[INFO] Stack ${STACK_NAME} already exists" echo "[INFO] Stack ${STACK_NAME} already exists"
heat stack-show ${STACK_NAME} openstack stack show ${STACK_NAME}
fi fi
} }
@ -250,7 +250,7 @@ function configure-kubectl() {
# STACK_NAME # STACK_NAME
function kube-down { function kube-down {
source "${ROOT}/openrc-default.sh" source "${ROOT}/openrc-default.sh"
heat stack-delete ${STACK_NAME} openstack stack delete ${STACK_NAME}
} }
# Perform preparations required to run e2e tests # Perform preparations required to run e2e tests