Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Move e2etest cluster resources to parent directory"
[icn.git]
/
env
/
lib
/
common.sh
diff --git
a/env/lib/common.sh
b/env/lib/common.sh
index
0de8406
..
2009c58
100755
(executable)
--- a/
env/lib/common.sh
+++ b/
env/lib/common.sh
@@
-7,8
+7,8
@@
IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"}
IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-}
IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1"}
IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"}
IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-}
IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1"}
-BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/
bionic/current/bionic
-server-cloudimg-amd64.img"}
-BM_IMAGE=${BM_IMAGE:-"
bionic
-server-cloudimg-amd64.img"}
+BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/
focal/current/focal
-server-cloudimg-amd64.img"}
+BM_IMAGE=${BM_IMAGE:-"
focal
-server-cloudimg-amd64.img"}
#Baremetal operator repository URL
BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
#Baremetal operator repository URL
BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
@@
-24,6
+24,13
@@
KUDPATH="/opt/src/github.com/onap/multicloud-k8s"
#KuD version to use
KUD_VERSION="ed96bca7fe415f1636d82c26af15d7474bdfe876"
#KuD version to use
KUD_VERSION="ed96bca7fe415f1636d82c26af15d7474bdfe876"
+#EMCO repository URL
+EMCOREPO="${EMCOREPO:-https://github.com/open-ness/EMCO.git}"
+#Path to clone the EMCO repo
+EMCOPATH="/opt/src/github.com/open-ness/EMCO"
+#EMCO version to use
+EMCO_VERSION="openness-21.03.06"
+
#Discard existing repo directory
FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-true}"
#Discard existing repo directory
FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-true}"
@@
-33,6
+40,9
@@
KUSTOMIZE_VERSION="v4.3.0"
#Cluster API version to use
CAPI_VERSION="v0.4.3"
#Cluster API version to use
CAPI_VERSION="v0.4.3"
+#Cluster API version to use
+CAPM3_VERSION="v0.5.1"
+
#The flux version to use
FLUX_VERSION="0.20.0"
#The flux version to use
FLUX_VERSION="0.20.0"
@@
-137,7
+147,7
@@
function node_networkdata {
exit 1
fi
exit 1
fi
- printf "
networks:\n"
+ printf "networks:\n"
for network in $(cat $NODES_FILE | jq -r --arg name "$name" '.nodes[] | select(.name==$name) | .net.networks[].id'); do
link=$(networkdata_networks_field $name $network "link")
type=$(networkdata_networks_field $name $network "type")
for network in $(cat $NODES_FILE | jq -r --arg name "$name" '.nodes[] | select(.name==$name) | .net.networks[].id'); do
link=$(networkdata_networks_field $name $network "link")
type=$(networkdata_networks_field $name $network "type")
@@
-148,17
+158,17
@@
function node_networkdata {
gateway=$(networkdata_networks_field $name $network "gateway")
dns_nameservers=$(networkdata_networks_field $name $network "dns_nameservers")
gateway=$(networkdata_networks_field $name $network "gateway")
dns_nameservers=$(networkdata_networks_field $name $network "dns_nameservers")
- printf "
${network}:\n"
- printf "
macAddress: ${mac}\n"
- printf "
type: ${type}\n"
+ printf " ${network}:\n"
+ printf " macAddress: ${mac}\n"
+ printf " type: ${type}\n"
if [[ $ip_address != "null" ]]; then
if [[ $ip_address != "null" ]]; then
- printf "
ipAddress: ${ip_address}\n"
+ printf " ipAddress: ${ip_address}\n"
fi
if [[ $gateway != "null" ]]; then
fi
if [[ $gateway != "null" ]]; then
- printf "
gateway: ${gateway}\n"
+ printf " gateway: ${gateway}\n"
fi
if [[ $dns_nameservers != "null" ]]; then
fi
if [[ $dns_nameservers != "null" ]]; then
- printf "
nameservers: ${dns_nameservers}\n"
+ printf " nameservers: ${dns_nameservers}\n"
fi
done
}
fi
done
}
@@
-207,6
+217,10
@@
function clone_kud_repository {
clone_repository ${KUDPATH} ${KUDREPO} ${KUD_VERSION}
}
clone_repository ${KUDPATH} ${KUDREPO} ${KUD_VERSION}
}
+function clone_emco_repository {
+ clone_repository ${EMCOPATH} ${EMCOREPO} ${EMCO_VERSION}
+}
+
function install_kustomize {
curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" -o kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
tar xzf kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --no-same-owner
function install_kustomize {
curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" -o kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
tar xzf kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --no-same-owner
@@
-228,6
+242,12
@@
function install_flux_cli {
flux --version
}
flux --version
}
+function install_emcoctl {
+ clone_emco_repository
+ make -C ${EMCOPATH}/src/tools/emcoctl
+ sudo install -o root -g root -m 0755 ${EMCOPATH}/bin/emcoctl/emcoctl /usr/local/bin/emcoctl
+}
+
function fetch_image {
if [[ "${BM_IMAGE_URL}" && "${BM_IMAGE}" ]]; then
mkdir -p "${IRONIC_DATA_DIR}/html/images"
function fetch_image {
if [[ "${BM_IMAGE_URL}" && "${BM_IMAGE}" ]]; then
mkdir -p "${IRONIC_DATA_DIR}/html/images"