From: Dominik Fleischmann Date: Thu, 4 Jun 2020 08:52:05 +0000 (+0200) Subject: Change naming of Charmed Installer Parameters X-Git-Tag: v7.1.0^0 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F9042%2F1;p=osm%2Fdevops.git Change naming of Charmed Installer Parameters The naming for the following parameters in the Charmed installer has been changed: kubeconfig -> k8s controller -> vca lxd-cloud -> lxd lxd-credentials -> lxd-cred Change-Id: Id760cd332c4be76a3cf45a108d7448387a78a94a Signed-off-by: Dominik Fleischmann --- diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index c919086a..e534c117 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -22,10 +22,10 @@ function check_arguments(){ while [ $# -gt 0 ] ; do case $1 in --bundle) BUNDLE="$2" ;; - --kubeconfig) KUBECFG="$2" ;; - --controller) CONTROLLER="$2" ;; - --lxd-cloud) LXD_CLOUD="$2" ;; - --lxd-credentials) LXD_CREDENTIALS="$2" ;; + --k8s) KUBECFG="$2" ;; + --vca) CONTROLLER="$2" ;; + --lxd) LXD_CLOUD="$2" ;; + --lxd-cred) LXD_CREDENTIALS="$2" ;; --microstack) MICROSTACK=y ;; --tag) TAG="$2" ;; esac diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index fd9595fe..ae5c83ec 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -60,14 +60,14 @@ function usage(){ echo -e " --showopts: print chosen options and exit (only for debugging)" echo -e " -y: do not prompt for confirmation, assumes yes" echo -e " -h / --help: print this help" - echo -e " --charmed: install OSM with charms" - echo -e " --bundle : Specify with which bundle to deploy OSM with charms (--charmed option)" - echo -e " --kubeconfig : Specify with which kubernetes to deploy OSM with charms (--charmed option)" - echo -e " --controller : Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)" - echo -e " --lxd-cloud : Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)" - echo -e " --lxd-credentials : Takes a YAML file as a parameter with the LXD Credentials information (--charmed option)" - echo -e " --microstack: Installs microstack as a vim. (--charmed option)" - echo -e " --tag: Docker image tag" + echo -e " --charmed: Deploy and operate OSM with Charms on k8s" + echo -e " [--bundle ]: Specify with which bundle to deploy OSM with charms (--charmed option)" + echo -e " [--k8s ]: Specify with which kubernetes to deploy OSM with charms (--charmed option)" + echo -e " [--vca ]: Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)" + echo -e " [--lxd ]: Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)" + echo -e " [--lxd-cred ]: Takes a YAML file as a parameter with the LXD Credentials information (--charmed option)" + echo -e " [--microstack]: Installs microstack as a vim. (--charmed option)" + echo -e " [--tag]: Docker image tag" } @@ -1413,9 +1413,9 @@ while getopts ":b:r:c:k:u:R:D:o:m:H:S:s:w:t:U:P:A:l:L:K:-: hy" o; do [ "${OPTARG}" == "k8s_monitor" ] && INSTALL_K8S_MONITOR="y" && continue [ "${OPTARG}" == "charmed" ] && CHARMED="y" && continue [ "${OPTARG}" == "bundle" ] && continue - [ "${OPTARG}" == "kubeconfig" ] && continue - [ "${OPTARG}" == "lxdendpoint" ] && continue - [ "${OPTARG}" == "lxdcert" ] && continue + [ "${OPTARG}" == "k8s" ] && continue + [ "${OPTARG}" == "lxd" ] && continue + [ "${OPTARG}" == "lxd-cred" ] && continue [ "${OPTARG}" == "microstack" ] && continue [ "${OPTARG}" == "tag" ] && continue [ "${OPTARG}" == "pla" ] && INSTALL_PLA="y" && continue diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 740ce4c7..4ede4191 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -68,12 +68,15 @@ function usage(){ #echo -e " --clean_volumes To clear all the mounted volumes from docker swarm" echo -e " -y: do not prompt for confirmation, assumes yes" echo -e " -h / --help: print this help" - echo -e " --charmed: install OSM with charms" - echo -e " --bundle : Specify with which bundle to deploy OSM with charms (--charmed option)" - echo -e " --kubeconfig : Specify with which kubernetes to deploy OSM with charms (--charmed option)" - echo -e " --controller : Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)" - echo -e " --lxd-cloud : Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)" - echo -e " --lxd-credentials : Takes a YAML file as a parameter with the LXD Credentials information (--charmed option)" + echo -e " --charmed: Deploy and operate OSM with Charms on k8s" + echo -e " [--bundle ]: Specify with which bundle to deploy OSM with charms (--charmed option)" + echo -e " [--k8s ]: Specify with which kubernetes to deploy OSM with charms (--charmed option)" + echo -e " [--vca ]: Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)" + echo -e " [--lxd ]: Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)" + echo -e " [--lxd-cred ]: Takes a YAML file as a parameter with the LXD Credentials information (--charmed option)" + echo -e " [--microstack]: Installs microstack as a vim. (--charmed option)" + echo -e " [--tag]: Docker image tag" + } add_repo() {