Fix 1391: New version of yq snap makes charmed installer to fail
Fix 1394: Use of R9 images
Change-Id: I0e246889e914c93963984b26423ab5620cb65efe
Signed-off-by: calvinosanc1 <guillermo.calvino@canonical.com>
diff --git a/installers/charm/lcm-k8s/config.yaml b/installers/charm/lcm-k8s/config.yaml
index 1f1c62b..e5ed6e1 100644
--- a/installers/charm/lcm-k8s/config.yaml
+++ b/installers/charm/lcm-k8s/config.yaml
@@ -65,7 +65,7 @@
image:
type: string
description: OCI image
- default: opensourcemano/lcm:8
+ default: opensourcemano/lcm:9
image_username:
description: Docker repository username
type: string
diff --git a/installers/charm/lcm/metadata.yaml b/installers/charm/lcm/metadata.yaml
index 155e4c3..1507b9f 100644
--- a/installers/charm/lcm/metadata.yaml
+++ b/installers/charm/lcm/metadata.yaml
@@ -37,7 +37,7 @@
image:
type: oci-image
description: OSM docker image for LCM
- upstream-source: "opensourcemano/lcm:8"
+ upstream-source: "opensourcemano/lcm:9"
requires:
kafka:
interface: kafka
diff --git a/installers/charm/mon-k8s/config.yaml b/installers/charm/mon-k8s/config.yaml
index 6f44b2e..0d43520 100644
--- a/installers/charm/mon-k8s/config.yaml
+++ b/installers/charm/mon-k8s/config.yaml
@@ -67,7 +67,7 @@
image:
type: string
description: OCI image
- default: opensourcemano/mon:8
+ default: opensourcemano/mon:9
image_username:
description: Docker repository username
type: string
diff --git a/installers/charm/mon/metadata.yaml b/installers/charm/mon/metadata.yaml
index 2578b1e..954fe37 100644
--- a/installers/charm/mon/metadata.yaml
+++ b/installers/charm/mon/metadata.yaml
@@ -37,7 +37,7 @@
image:
type: oci-image
description: OSM docker image for MON
- upstream-source: "opensourcemano/mon:8"
+ upstream-source: "opensourcemano/mon:9"
requires:
kafka:
interface: kafka
diff --git a/installers/charm/nbi-k8s/config.yaml b/installers/charm/nbi-k8s/config.yaml
index a594f6e..4ca2ad8 100755
--- a/installers/charm/nbi-k8s/config.yaml
+++ b/installers/charm/nbi-k8s/config.yaml
@@ -31,7 +31,7 @@
image:
type: string
description: OCI image
- default: opensourcemano/nbi:8
+ default: opensourcemano/nbi:9
image_username:
description: Docker repository username
type: string
diff --git a/installers/charm/nbi/metadata.yaml b/installers/charm/nbi/metadata.yaml
index e4b55ab..61d6b4b 100644
--- a/installers/charm/nbi/metadata.yaml
+++ b/installers/charm/nbi/metadata.yaml
@@ -37,7 +37,7 @@
image:
type: oci-image
description: OSM docker image for NBI
- upstream-source: "opensourcemano/nbi:8"
+ upstream-source: "opensourcemano/nbi:9"
requires:
kafka:
interface: kafka
diff --git a/installers/charm/ng-ui/metadata.yaml b/installers/charm/ng-ui/metadata.yaml
index 316047f..e00266a 100644
--- a/installers/charm/ng-ui/metadata.yaml
+++ b/installers/charm/ng-ui/metadata.yaml
@@ -29,4 +29,4 @@
image:
type: oci-image
description: OSM docker image for NBI
- upstream-source: "opensourcemano/ng-ui:8"
+ upstream-source: "opensourcemano/ng-ui:9"
diff --git a/installers/charm/pol-k8s/config.yaml b/installers/charm/pol-k8s/config.yaml
index d33a715..95bca15 100644
--- a/installers/charm/pol-k8s/config.yaml
+++ b/installers/charm/pol-k8s/config.yaml
@@ -23,7 +23,7 @@
image:
type: string
description: OCI image
- default: opensourcemano/pol:8
+ default: opensourcemano/pol:9
image_username:
description: Docker repository username
type: string
diff --git a/installers/charm/pol/metadata.yaml b/installers/charm/pol/metadata.yaml
index a0fa3fe..78c4830 100644
--- a/installers/charm/pol/metadata.yaml
+++ b/installers/charm/pol/metadata.yaml
@@ -37,7 +37,7 @@
image:
type: oci-image
description: OSM docker image for POL
- upstream-source: "opensourcemano/pol:8"
+ upstream-source: "opensourcemano/pol:9"
requires:
kafka:
interface: kafka
diff --git a/installers/charm/ro-k8s/config.yaml b/installers/charm/ro-k8s/config.yaml
index e93cc49..42b281d 100755
--- a/installers/charm/ro-k8s/config.yaml
+++ b/installers/charm/ro-k8s/config.yaml
@@ -31,7 +31,7 @@
image:
type: string
description: OCI image
- default: opensourcemano/ro:8
+ default: opensourcemano/ro:9
image_username:
description: Docker repository username
type: string
@@ -43,4 +43,4 @@
database_commonkey:
description: Database common key
type: string
- default: osm
\ No newline at end of file
+ default: osm
diff --git a/installers/charm/ui-k8s/config.yaml b/installers/charm/ui-k8s/config.yaml
index d4321ae..5a156b1 100755
--- a/installers/charm/ui-k8s/config.yaml
+++ b/installers/charm/ui-k8s/config.yaml
@@ -27,7 +27,7 @@
image:
type: string
description: OCI image
- default: opensourcemano/light-ui:8
+ default: opensourcemano/light-ui:9
image_username:
description: Docker repository username
type: string
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 4d04a91..7f05e04 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -310,14 +310,14 @@
sudo snap install jq
sudo snap install yq
local HOME=/home/$USER
- local vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq r - controllers.$CONTROLLER_NAME.user)
- local vca_password=$(cat $HOME/.local/share/juju/accounts.yaml | yq r - controllers.$CONTROLLER_NAME.password)
- local vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.api-endpoints[0] | cut -d ":" -f 1)
- local vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.api-endpoints[0] | cut -d ":" -f 2)
+ local vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq e .controllers.$CONTROLLER_NAME.user - )
+ local vca_password=$(cat $HOME/.local/share/juju/accounts.yaml | yq e .controllers.$CONTROLLER_NAME.password - )
+ local vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.api-endpoints[0] - | cut -d ":" -f 1)
+ local vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.api-endpoints[0] - | cut -d ":" -f 2)
local vca_pubkey=\"$(cat $HOME/.local/share/juju/ssh/juju_id_rsa.pub)\"
local vca_cloud="lxd-cloud"
# Get the VCA Certificate
- local vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq r - controllers.$CONTROLLER_NAME.ca-cert | base64 | tr -d \\n)
+ local vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq e .controllers.$CONTROLLER_NAME.ca-cert - | base64 | tr -d \\n)
# Calculate the default route of this machine
local DEFAULT_IF=`ip route list match 0.0.0.0 | awk '{print $5}'`