projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feature 10986: Autoheal switch and Autoscale switch
[osm/devops.git]
/
installers
/
install_juju.sh
diff --git
a/installers/install_juju.sh
b/installers/install_juju.sh
index
dd9eb3b
..
68c8628
100755
(executable)
--- a/
installers/install_juju.sh
+++ b/
installers/install_juju.sh
@@
-73,11
+73,11
@@
snap-https-proxy: ${HTTPS_PROXY}
EOF
JUJU_BOOTSTRAP_OPTS="--model-default /tmp/.osm/model-config.yaml"
fi
EOF
JUJU_BOOTSTRAP_OPTS="--model-default /tmp/.osm/model-config.yaml"
fi
- juju bootstrap -v --debug $OSM_VCA_K8S_CLOUDNAME $OSM_
STACK_NAM
E \
+ juju bootstrap -v --debug $OSM_VCA_K8S_CLOUDNAME $OSM_
NAMESPAC
E \
--config controller-service-type=loadbalancer \
--agent-version=$JUJU_AGENT_VERSION \
${JUJU_BOOTSTRAP_OPTS} \
--config controller-service-type=loadbalancer \
--agent-version=$JUJU_AGENT_VERSION \
${JUJU_BOOTSTRAP_OPTS} \
- || FATAL "Failed to bootstrap controller $OSM_
STACK_NAM
E in cloud $OSM_VCA_K8S_CLOUDNAME"
+ || FATAL "Failed to bootstrap controller $OSM_
NAMESPAC
E in cloud $OSM_VCA_K8S_CLOUDNAME"
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
@@
-109,8
+109,8
@@
credentials:
client-key: /tmp/.osm/client.key
EOF
lxc config trust add local: /tmp/.osm/client.crt
client-key: /tmp/.osm/client.key
EOF
lxc config trust add local: /tmp/.osm/client.crt
- juju add-cloud -c $OSM_
STACK_NAM
E $OSM_VCA_CLOUDNAME $LXD_CLOUD --force
- juju add-credential -c $OSM_
STACK_NAM
E $OSM_VCA_CLOUDNAME -f $LXD_CREDENTIALS
+ juju add-cloud -c $OSM_
NAMESPAC
E $OSM_VCA_CLOUDNAME $LXD_CLOUD --force
+ juju add-credential -c $OSM_
NAMESPAC
E $OSM_VCA_CLOUDNAME -f $LXD_CREDENTIALS
sg lxd -c "lxd waitready"
juju controller-config features=[k8s-operators]
if [ -n "${OSM_BEHIND_PROXY}" ] ; then
sg lxd -c "lxd waitready"
juju controller-config features=[k8s-operators]
if [ -n "${OSM_BEHIND_PROXY}" ] ; then
@@
-160,7
+160,7
@@
JUJU_AGENT_VERSION=2.9.34
JUJU_VERSION=2.9
OSM_BEHIND_PROXY=""
OSM_DEVOPS=
JUJU_VERSION=2.9
OSM_BEHIND_PROXY=""
OSM_DEVOPS=
-OSM_
STACK_NAM
E=osm
+OSM_
NAMESPAC
E=osm
OSM_VCA_HOST=
OSM_VCA_CLOUDNAME="localhost"
OSM_VCA_K8S_CLOUDNAME="k8scloud"
OSM_VCA_HOST=
OSM_VCA_CLOUDNAME="localhost"
OSM_VCA_K8S_CLOUDNAME="k8scloud"
@@
-175,7
+175,7
@@
while getopts ":D:i:s:H:l:L:K:-: hP" o; do
DEFAULT_IP="${OPTARG}"
;;
s)
DEFAULT_IP="${OPTARG}"
;;
s)
- OSM_
STACK_NAM
E="${OPTARG}" && [[ ! "${OPTARG}" =~ $RE_CHECK ]] && echo "Namespace $OPTARG is invalid. Regex used for validation is $RE_CHECK" && exit 0
+ OSM_
NAMESPAC
E="${OPTARG}" && [[ ! "${OPTARG}" =~ $RE_CHECK ]] && echo "Namespace $OPTARG is invalid. Regex used for validation is $RE_CHECK" && exit 0
;;
H)
OSM_VCA_HOST="${OPTARG}"
;;
H)
OSM_VCA_HOST="${OPTARG}"
@@
-278,7
+278,7
@@
EOF
juju add-credential -c $CONTROLLER_NAME $OSM_VCA_CLOUDNAME -f ~/.osm/lxd-credentials.yaml || juju update-credential lxd-cloud -c $CONTROLLER_NAME -f ~/.osm/lxd-credentials.yaml
fi
fi
juju add-credential -c $CONTROLLER_NAME $OSM_VCA_CLOUDNAME -f ~/.osm/lxd-credentials.yaml || juju update-credential lxd-cloud -c $CONTROLLER_NAME -f ~/.osm/lxd-credentials.yaml
fi
fi
- [ -z "$CONTROLLER_NAME" ] && OSM_VCA_HOST=`sg lxd -c "juju show-controller $OSM_
STACK_NAM
E"|grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
+ [ -z "$CONTROLLER_NAME" ] && OSM_VCA_HOST=`sg lxd -c "juju show-controller $OSM_
NAMESPAC
E"|grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
[ -n "$CONTROLLER_NAME" ] && OSM_VCA_HOST=`juju show-controller $CONTROLLER_NAME |grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
[ -z "$OSM_VCA_HOST" ] && FATAL "Cannot obtain juju controller IP address"
fi
[ -n "$CONTROLLER_NAME" ] && OSM_VCA_HOST=`juju show-controller $CONTROLLER_NAME |grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
[ -z "$OSM_VCA_HOST" ] && FATAL "Cannot obtain juju controller IP address"
fi