From c537fa671e5763cf58f9a05ff7e51e5acc184934 Mon Sep 17 00:00:00 2001 From: David Garcia Date: Tue, 9 Nov 2021 08:45:49 +0100 Subject: [PATCH] Fix bug 1766: update to latest charm revisions (Charmed installer) The new revisions include: - fixed security issues: secret management - Authentication in prometheus and grafana - Fix n2vc path in LCM charm (debug-mode) Change-Id: I4ace5a2e8e7f96883e439047dff739c8a9b40870 Signed-off-by: David Garcia --- installers/charm/bundles/osm-ha/bundle.yaml | 46 ++++++++++---------- installers/charm/bundles/osm/bundle.yaml | 48 ++++++++++----------- installers/charm/lcm/src/charm.py | 2 +- installers/charmed_install.sh | 4 ++ 4 files changed, 53 insertions(+), 47 deletions(-) diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml index a7ebc38f..36d1b37d 100644 --- a/installers/charm/bundles/osm-ha/bundle.yaml +++ b/installers/charm/bundles/osm-ha/bundle.yaml @@ -28,8 +28,8 @@ description: | - Availability of managed services bundle: kubernetes applications: - zookeeper-k8s: - charm: "cs:~charmed-osm/zookeeper-k8s" + zookeeper: + charm: "cs:~charmed-osm/zookeeper-0" channel: "stable" scale: 3 series: kubernetes @@ -55,8 +55,8 @@ applications: annotations: gui-x: -300 gui-y: -250 - kafka-k8s: - charm: "cs:~charmed-osm/kafka-k8s" + kafka: + charm: "cs:~charmed-osm/kafka-0" channel: "stable" scale: 3 series: kubernetes @@ -78,7 +78,7 @@ applications: gui-x: 0 gui-y: 0 nbi: - charm: "cs:~charmed-osm/nbi-16" + charm: "cs:~charmed-osm/nbi-17" scale: 3 series: kubernetes options: @@ -89,7 +89,7 @@ applications: gui-x: 0 gui-y: -250 ro: - charm: "cs:~charmed-osm/ro-8" + charm: "cs:~charmed-osm/ro-9" scale: 3 series: kubernetes options: @@ -98,14 +98,14 @@ applications: gui-x: -300 gui-y: 250 ng-ui: - charm: "cs:~charmed-osm/ng-ui-23" + charm: "cs:~charmed-osm/ng-ui-24" scale: 3 series: kubernetes annotations: gui-x: 600 gui-y: 0 lcm: - charm: "cs:~charmed-osm/lcm-13" + charm: "cs:~charmed-osm/lcm-14" scale: 3 series: kubernetes options: @@ -115,7 +115,7 @@ applications: gui-x: -300 gui-y: 0 mon: - charm: "cs:~charmed-osm/mon-9" + charm: "cs:~charmed-osm/mon-11" scale: 1 series: kubernetes options: @@ -126,7 +126,7 @@ applications: gui-x: 300 gui-y: 0 pol: - charm: "cs:~charmed-osm/pol-8" + charm: "cs:~charmed-osm/pol-9" scale: 3 series: kubernetes options: @@ -135,7 +135,7 @@ applications: gui-x: -300 gui-y: 500 pla: - charm: "cs:~charmed-osm/pla-11" + charm: "cs:~charmed-osm/pla-12" scale: 3 series: kubernetes options: @@ -144,7 +144,7 @@ applications: gui-x: 600 gui-y: -250 prometheus: - charm: "cs:~charmed-osm/prometheus-6" + charm: "cs:~charmed-osm/prometheus-8" scale: 1 series: kubernetes storage: @@ -155,14 +155,14 @@ applications: gui-x: 300 gui-y: 250 grafana: - charm: "cs:~charmed-osm/grafana-6" + charm: "cs:~charmed-osm/grafana-9" scale: 3 series: kubernetes annotations: gui-x: 300 gui-y: 500 keystone: - charm: "cs:~charmed-osm/keystone-12" + charm: "cs:~charmed-osm/keystone-15" scale: 1 series: kubernetes annotations: @@ -171,36 +171,36 @@ applications: relations: - - grafana:prometheus - prometheus:prometheus - - - kafka-k8s:zookeeper - - zookeeper-k8s:zookeeper + - - kafka:zookeeper + - zookeeper:zookeeper - - keystone:db - mariadb-k8s:mysql - - lcm:kafka - - kafka-k8s:kafka + - kafka:kafka - - lcm:mongodb - mongodb:database - - ro:ro - lcm:ro - - ro:kafka - - kafka-k8s:kafka + - kafka:kafka - - ro:mongodb - mongodb:database - - pol:kafka - - kafka-k8s:kafka + - kafka:kafka - - pol:mongodb - mongodb:database - - mon:mongodb - mongodb:database - - mon:kafka - - kafka-k8s:kafka + - kafka:kafka - - pla:kafka - - kafka-k8s:kafka + - kafka:kafka - - pla:mongodb - mongodb:database - - nbi:mongodb - mongodb:database - - nbi:kafka - - kafka-k8s:kafka + - kafka:kafka - - nbi:prometheus - prometheus:prometheus - - nbi:keystone @@ -213,3 +213,5 @@ relations: - keystone:keystone - - mariadb-k8s:mysql - pol:mysql + - - grafana:db + - mariadb-k8s:mysql diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml index 36322fe2..13259511 100644 --- a/installers/charm/bundles/osm/bundle.yaml +++ b/installers/charm/bundles/osm/bundle.yaml @@ -27,9 +27,8 @@ description: | - Availability of managed services bundle: kubernetes applications: - zookeeper-k8s: - charm: "cs:~charmed-osm/zookeeper-k8s" - channel: "stable" + zookeeper: + charm: "cs:~charmed-osm/zookeeper-0" scale: 1 series: kubernetes storage: @@ -51,9 +50,8 @@ applications: annotations: gui-x: -300 gui-y: -250 - kafka-k8s: - charm: "cs:~charmed-osm/kafka-k8s" - channel: "stable" + kafka: + charm: "cs:~charmed-osm/kafka-0" scale: 1 series: kubernetes storage: @@ -71,7 +69,7 @@ applications: gui-x: 0 gui-y: 0 nbi: - charm: "cs:~charmed-osm/nbi-16" + charm: "cs:~charmed-osm/nbi-17" scale: 1 series: kubernetes options: @@ -82,7 +80,7 @@ applications: gui-x: 0 gui-y: -250 ro: - charm: "cs:~charmed-osm/ro-8" + charm: "cs:~charmed-osm/ro-9" scale: 1 series: kubernetes options: @@ -91,14 +89,14 @@ applications: gui-x: -300 gui-y: 250 ng-ui: - charm: "cs:~charmed-osm/ng-ui-23" + charm: "cs:~charmed-osm/ng-ui-24" scale: 1 series: kubernetes annotations: gui-x: 600 gui-y: 0 lcm: - charm: "cs:~charmed-osm/lcm-13" + charm: "cs:~charmed-osm/lcm-14" scale: 1 series: kubernetes options: @@ -108,7 +106,7 @@ applications: gui-x: -300 gui-y: 0 mon: - charm: "cs:~charmed-osm/mon-9" + charm: "cs:~charmed-osm/mon-11" scale: 1 series: kubernetes options: @@ -119,7 +117,7 @@ applications: gui-x: 300 gui-y: 0 pol: - charm: "cs:~charmed-osm/pol-8" + charm: "cs:~charmed-osm/pol-9" scale: 1 series: kubernetes options: @@ -128,7 +126,7 @@ applications: gui-x: -300 gui-y: 500 pla: - charm: "cs:~charmed-osm/pla-11" + charm: "cs:~charmed-osm/pla-12" scale: 1 series: kubernetes options: @@ -137,7 +135,7 @@ applications: gui-x: 600 gui-y: -250 prometheus: - charm: "cs:~charmed-osm/prometheus-6" + charm: "cs:~charmed-osm/prometheus-8" scale: 1 series: kubernetes storage: @@ -148,14 +146,14 @@ applications: gui-x: 300 gui-y: 250 grafana: - charm: "cs:~charmed-osm/grafana-6" + charm: "cs:~charmed-osm/grafana-9" scale: 1 series: kubernetes annotations: gui-x: 300 gui-y: 500 keystone: - charm: "cs:~charmed-osm/keystone-12" + charm: "cs:~charmed-osm/keystone-15" scale: 1 series: kubernetes annotations: @@ -164,36 +162,36 @@ applications: relations: - - grafana:prometheus - prometheus:prometheus - - - kafka-k8s:zookeeper - - zookeeper-k8s:zookeeper + - - kafka:zookeeper + - zookeeper:zookeeper - - keystone:db - mariadb-k8s:mysql - - lcm:kafka - - kafka-k8s:kafka + - kafka:kafka - - lcm:mongodb - mongodb:database - - ro:ro - lcm:ro - - ro:kafka - - kafka-k8s:kafka + - kafka:kafka - - ro:mongodb - mongodb:database - - pol:kafka - - kafka-k8s:kafka + - kafka:kafka - - pol:mongodb - mongodb:database - - mon:mongodb - mongodb:database - - mon:kafka - - kafka-k8s:kafka + - kafka:kafka - - pla:kafka - - kafka-k8s:kafka + - kafka:kafka - - pla:mongodb - mongodb:database - - nbi:mongodb - mongodb:database - - nbi:kafka - - kafka-k8s:kafka + - kafka:kafka - - nbi:prometheus - prometheus:prometheus - - nbi:keystone @@ -206,3 +204,5 @@ relations: - keystone:keystone - - mariadb-k8s:mysql - pol:mysql + - - grafana:db + - mariadb-k8s:mysql diff --git a/installers/charm/lcm/src/charm.py b/installers/charm/lcm/src/charm.py index 5291c077..aac1813a 100755 --- a/installers/charm/lcm/src/charm.py +++ b/installers/charm/lcm/src/charm.py @@ -300,7 +300,7 @@ class LcmCharm(CharmedOsmBase): VSCODE_WORKSPACE = { "folders": [ {"path": "/usr/lib/python3/dist-packages/osm_lcm"}, - {"path": "/usr/lib/python3/dist-packages/osm_n2vc"}, + {"path": "/usr/lib/python3/dist-packages/n2vc"}, {"path": "/usr/lib/python3/dist-packages/osm_common"}, ], "settings": {}, diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index 577fe82c..c686597a 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -286,6 +286,10 @@ function deploy_charmed_osm(){ echo "Waiting for deployment to finish..." check_osm_deployed + grafana_leader=`juju status -m $MODEL_NAME grafana | grep "*" | cut -d "*" -f 1` + grafana_admin_password=`juju run -m $MODEL_NAME --unit $grafana_leader "echo \\$GF_SECURITY_ADMIN_PASSWORD"` + juju config -m $MODEL_NAME mon grafana_password=$grafana_admin_password + check_osm_deployed echo "OSM with charms deployed" } -- 2.17.1