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 <dominik.fleischmann@canonical.com>
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index c919086..e534c11 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -22,10 +22,10 @@
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 fd9595f..ae5c83e 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -60,14 +60,14 @@
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 <bundle path>: Specify with which bundle to deploy OSM with charms (--charmed option)"
- echo -e " --kubeconfig <kubeconfig path>: Specify with which kubernetes to deploy OSM with charms (--charmed option)"
- echo -e " --controller <name>: Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)"
- echo -e " --lxd-cloud <yaml path>: Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)"
- echo -e " --lxd-credentials <yaml path>: 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 <bundle path>]: Specify with which bundle to deploy OSM with charms (--charmed option)"
+ echo -e " [--k8s <kubeconfig path>]: Specify with which kubernetes to deploy OSM with charms (--charmed option)"
+ echo -e " [--vca <name>]: Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)"
+ echo -e " [--lxd <yaml path>]: Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)"
+ echo -e " [--lxd-cred <yaml path>]: 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 @@
[ "${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 740ce4c..4ede419 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -68,12 +68,15 @@
#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 <bundle path>: Specify with which bundle to deploy OSM with charms (--charmed option)"
- echo -e " --kubeconfig <kubeconfig path>: Specify with which kubernetes to deploy OSM with charms (--charmed option)"
- echo -e " --controller <name>: Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)"
- echo -e " --lxd-cloud <yaml path>: Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)"
- echo -e " --lxd-credentials <yaml path>: 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 <bundle path>]: Specify with which bundle to deploy OSM with charms (--charmed option)"
+ echo -e " [--k8s <kubeconfig path>]: Specify with which kubernetes to deploy OSM with charms (--charmed option)"
+ echo -e " [--vca <name>]: Specifies the name of the controller to use - The controller must be already bootstrapped (--charmed option)"
+ echo -e " [--lxd <yaml path>]: Takes a YAML file as a parameter with the LXD Cloud information (--charmed option)"
+ echo -e " [--lxd-cred <yaml path>]: 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() {