Prepare installer and pods for Rel TWELVE
Change-Id: I9fa2bfe6322748b9fbd22d2348b88f8f63df0329
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/installers/docker/osm_pla/pla.yaml b/installers/docker/osm_pla/pla.yaml
index 79590ed..64d9500 100644
--- a/installers/docker/osm_pla/pla.yaml
+++ b/installers/docker/osm_pla/pla.yaml
@@ -39,7 +39,7 @@
command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017 ); do sleep 3; done; exit 0"]
containers:
- name: pla
- image: opensourcemano/pla:11
+ image: opensourcemano/pla:12
env:
- name: OSMPLA_DATABASE_HOST
value: mongo
diff --git a/installers/docker/osm_pods/keystone.yaml b/installers/docker/osm_pods/keystone.yaml
index 66ab480..00e565d 100644
--- a/installers/docker/osm_pods/keystone.yaml
+++ b/installers/docker/osm_pods/keystone.yaml
@@ -46,7 +46,7 @@
spec:
containers:
- name: keystone
- image: opensourcemano/keystone:11
+ image: opensourcemano/keystone:12
ports:
- containerPort: 5000
protocol: TCP
diff --git a/installers/docker/osm_pods/lcm.yaml b/installers/docker/osm_pods/lcm.yaml
index f52d724..6fc5402 100644
--- a/installers/docker/osm_pods/lcm.yaml
+++ b/installers/docker/osm_pods/lcm.yaml
@@ -41,7 +41,7 @@
command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 ro 9090 && nc -zvw1 mongodb-k8s 27017 ); do sleep 3; done; exit 0"]
containers:
- name: lcm
- image: opensourcemano/lcm:11
+ image: opensourcemano/lcm:12
env:
- name: OSMLCM_RO_HOST
value: ro
diff --git a/installers/docker/osm_pods/mon.yaml b/installers/docker/osm_pods/mon.yaml
index dff0114..b803724 100644
--- a/installers/docker/osm_pods/mon.yaml
+++ b/installers/docker/osm_pods/mon.yaml
@@ -50,7 +50,7 @@
command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
containers:
- name: mon
- image: opensourcemano/mon:11
+ image: opensourcemano/mon:12
ports:
- containerPort: 8662
protocol: TCP
diff --git a/installers/docker/osm_pods/nbi.yaml b/installers/docker/osm_pods/nbi.yaml
index bbdf645..0664695 100644
--- a/installers/docker/osm_pods/nbi.yaml
+++ b/installers/docker/osm_pods/nbi.yaml
@@ -54,7 +54,7 @@
command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
containers:
- name: nbi
- image: opensourcemano/nbi:11
+ image: opensourcemano/nbi:12
ports:
- containerPort: 9999
protocol: TCP
diff --git a/installers/docker/osm_pods/ng-ui.yaml b/installers/docker/osm_pods/ng-ui.yaml
index f5b1658..40c9e5d 100644
--- a/installers/docker/osm_pods/ng-ui.yaml
+++ b/installers/docker/osm_pods/ng-ui.yaml
@@ -46,7 +46,7 @@
spec:
containers:
- name: ng-ui
- image: opensourcemano/ng-ui:11
+ image: opensourcemano/ng-ui:12
ports:
- containerPort: 80
protocol: TCP
diff --git a/installers/docker/osm_pods/pol.yaml b/installers/docker/osm_pods/pol.yaml
index 5f562c2..9c852c5 100644
--- a/installers/docker/osm_pods/pol.yaml
+++ b/installers/docker/osm_pods/pol.yaml
@@ -40,7 +40,7 @@
command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
containers:
- name: pol
- image: opensourcemano/pol:11
+ image: opensourcemano/pol:12
env:
- name: OSMPOL_MESSAGE_HOST
value: kafka
diff --git a/installers/docker/osm_pods/prometheus.yaml b/installers/docker/osm_pods/prometheus.yaml
index c564759..ac3a524 100644
--- a/installers/docker/osm_pods/prometheus.yaml
+++ b/installers/docker/osm_pods/prometheus.yaml
@@ -128,7 +128,7 @@
- name: prom-db
mountPath: /prometheus
- name: prometheus-config-sidecar
- image: opensourcemano/prometheus:11
+ image: opensourcemano/prometheus:12
env:
- name: MONGODB_URL
value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
diff --git a/installers/docker/osm_pods/ro.yaml b/installers/docker/osm_pods/ro.yaml
index 0daccf6..af593a8 100644
--- a/installers/docker/osm_pods/ro.yaml
+++ b/installers/docker/osm_pods/ro.yaml
@@ -50,7 +50,7 @@
command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017 ); do sleep 3; done; exit 0"]
containers:
- name: ro
- image: opensourcemano/ro:11
+ image: opensourcemano/ro:12
ports:
- containerPort: 9090
protocol: TCP
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index ce0f214..96d8b8b 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -67,8 +67,6 @@
echo -e " --pullimages: pull/run osm images from docker.io/opensourcemano"
echo -e " --k8s_monitor: install the OSM kubernetes monitoring with prometheus and grafana"
echo -e " --volume: create a VM volume when installing to OpenStack"
-# echo -e " --reconfigure: reconfigure the modules (DO NOT change NAT rules)"
-# echo -e " --update: update to the latest stable release or to the latest commit if using a specific branch"
echo -e " --showopts: print chosen options and exit (only for debugging)"
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)"
@@ -570,7 +568,7 @@
list_of_services="$list_of_services $module"
fi
done
- if [ ! "$OSM_DOCKER_TAG" == "11" ]; then
+ if [ ! "$OSM_DOCKER_TAG" == "12" ]; then
parse_yaml $OSM_DOCKER_TAG $list_of_services
fi
if [ -n "$MODULE_DOCKER_TAG" ]; then
@@ -737,7 +735,7 @@
add_local_k8scluster
track final_ops add_local_k8scluster_ok
- wget -q -O- https://osm-download.etsi.org/ftp/osm-11.0-eleven/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-12.0-twelve/README2.txt &> /dev/null
track end
sudo find /etc/osm
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
@@ -1138,7 +1136,7 @@
track start release $RELEASE none none docker_tag $OSM_DOCKER_TAG none none installation_type $OSM_INSTALLATION_TYPE none none
${OSM_DEVOPS}/installers/charmed_install.sh --tag $OSM_DOCKER_TAG "$@" || \
FATAL_TRACK charmed_install "charmed_install.sh failed"
- wget -q -O- https://osm-download.etsi.org/ftp/osm-11.0-eleven/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-12.0-twelve/README2.txt &> /dev/null
track end installation_type $OSM_INSTALLATION_TYPE
echo -e "\nDONE"
exit 0
@@ -1193,7 +1191,7 @@
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
#Installation starts here
-wget -q -O- https://osm-download.etsi.org/ftp/osm-11.0-eleven/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-12.0-twelve/README.txt &> /dev/null
export OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)"
install_osm
echo -e "\nDONE"
diff --git a/installers/install_osm.sh b/installers/install_osm.sh
index 3a2c3b4..7199c3b 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -13,9 +13,9 @@
# limitations under the License.
#
REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian
-RELEASE=ReleaseELEVEN
+RELEASE=ReleaseTWELVE
REPOSITORY=stable
-DOCKER_TAG=11
+DOCKER_TAG=12
DEVOPS_PATH=/usr/share/osm-devops
function usage(){
@@ -33,20 +33,23 @@
echo -e " -b v2.0 (v2.0 branch)"
echo -e " -b tags/v1.1.0 (a specific tag)"
echo -e " ..."
- echo -e " -c <orchestrator> deploy osm services using container <orchestrator>. Valid values are <k8s> or <swarm>. If -c is not used then osm will be deployed using default orchestrator. When used with --uninstall, osm services deployed by the orchestrator will be uninstalled"
+ echo -e " -a <apt proxy url>: use this apt proxy url when downloading apt packages (air-gapped installation)"
echo -e " -s <stack name> or <namespace> user defined stack name when installed using swarm or namespace when installed using k8s, default is osm"
echo -e " -H <VCA host> use specific juju host controller IP"
echo -e " -S <VCA secret> use VCA/juju secret key"
echo -e " -P <VCA pubkey> use VCA/juju public key file"
echo -e " -C <VCA cacert> use VCA/juju CA certificate file"
echo -e " -A <VCA apiproxy> use VCA/juju API proxy"
- echo -e " --vimemu: additionally deploy the VIM emulator as a docker container"
- echo -e " --elk_stack: additionally deploy an ELK docker stack for event logging"
echo -e " --pla: install the PLA module for placement support"
+ echo -e " -m <MODULE>: install OSM but only rebuild or pull the specified docker images (NG-UI, NBI, LCM, RO, MON, POL, PLA, KAFKA, MONGO, PROMETHEUS, PROMETHEUS-CADVISOR, KEYSTONE-DB, NONE)"
+ echo -e " -o <ADDON>: ONLY (un)installs one of the addons (k8s_monitor)"
+ echo -e " -O <openrc file path/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"
echo -e " -m <MODULE>: install OSM but only rebuild the specified docker images (LW-UI, NBI, LCM, RO, MON, POL, KAFKA, MONGO, PROMETHEUS, PROMETHEUS-CADVISOR, KEYSTONE-DB, PLA, NONE)"
echo -e " -o <ADDON>: ONLY (un)installs one of the addons (vimemu, elk_stack, k8s_monitor)"
echo -e " -O <openrc file/cloud name>: Install OSM to an OpenStack infrastructure. <openrc file/cloud name> is required. If a <cloud name> is used, the clouds.yaml file should be under ~/.config/openstack/ or /etc/openstack/"
echo -e " -N <openstack public network name/ID>: Public network name required to setup OSM to OpenStack"
+ echo -e " -f <path to SSH public key>: Public SSH key to use to deploy OSM to OpenStack"
+ echo -e " -F <path to cloud-init file>: Cloud-Init userdata file to deploy OSM to OpenStack"
echo -e " -D <devops path> use local devops installation path"
echo -e " -w <work dir> Location to store runtime installation"
echo -e " -t <docker tag> specify osm docker tag (default is latest)"
@@ -56,7 +59,9 @@
echo -e " -d <docker registry URL> use docker registry URL instead of dockerhub"
echo -e " -p <docker proxy URL> set docker proxy URL as part of docker CE configuration"
echo -e " -T <docker tag> specify docker tag for the modules specified with option -m"
+ echo -e " --debug: debug mode"
echo -e " --nocachelxdimages: do not cache local lxd images, do not create cronjob for that cache (will save installation time, might affect instantiation time)"
+ echo -e " --cachelxdimages: cache local lxd images, create cronjob for that cache (will make installation longer)"
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"
@@ -74,8 +79,8 @@
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 " [--small-profile]: Do not install and configure LXD which aims to use only K8s Clouds (--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 " [--overlay]: Add an overlay to override some defaults of the default bundle (--charmed option)"