X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_osm.sh;h=740ce4c7a79b5ac4b25467f48f62000e335fbb7b;hb=8267106e698eab0c95d16a0e46fbd7333f22aab4;hp=2e4be51ee22f15aefcd3b73db48ad48cd229025d;hpb=47cd3b277310d5d6fef0067f220e849bebff35b4;p=osm%2Fdevops.git diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 2e4be51e..740ce4c7 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -45,7 +45,10 @@ function usage(){ echo -e " -D use local devops installation path" echo -e " -w Location to store runtime installation" echo -e " -t specify osm docker tag (default is latest)" - echo -e " --nolxd: do not install and configure LXD, allowing unattended installations (assumes LXD is already installed and configured)" + echo -e " -l: LXD cloud yaml file" + echo -e " -L: LXD credentials yaml file" + echo -e " -K: Specifies the name of the controller to use - The controller must be already bootstrapped" + echo -e " --nolxd: do not install and configure LXD, allowing unattended installations (assumes LXD is already installed and confifured)" echo -e " --nodocker: do not install docker, do not initialize a swarm (assumes docker is already installed and a swarm has been initialized)" echo -e " --nojuju: do not juju, assumes already installed" echo -e " --nodockerbuild:do not build docker images (use existing locally cached images)" @@ -68,9 +71,9 @@ function usage(){ 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 " --lxdendpoint : Specify with which LXD to deploy OSM with charms (--charmed option)" - echo -e " --lxdcert : Specify external LXD cert 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)" } add_repo() { @@ -106,7 +109,7 @@ if [ $? -eq 0 ]; then fi } -while getopts ":b:r:c:k:u:R:l:p:D:o:m:H:S:s:w:t:U:P:A:-: hy" o; do +while getopts ":b:r:c:k:u:R:l:L:K:p:D:o:m:H:S:s:w:t:U:P:A:-: hy" o; do case "${o}" in r) REPOSITORY="${OPTARG}"