Changing charmed installer to use 10.0/stable
Fixing black error in keystone charm
OSM bundles are modified to deploy osm charms from 10.0/stable.
Change-Id: I58d987286722431150424f1f8ddce6341754fa73
Signed-off-by: aticig <gulsum.atici@canonical.com>
diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 9d28fe5..69d353f 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -62,7 +62,7 @@
db: 50M
nbi:
charm: osm-nbi
- channel: latest/candidate
+ channel: 10.0/stable
scale: 3
series: kubernetes
options:
@@ -73,7 +73,7 @@
image: opensourcemano/nbi:10
ro:
charm: osm-ro
- channel: latest/candidate
+ channel: 10.0/stable
scale: 3
series: kubernetes
options:
@@ -82,14 +82,14 @@
image: opensourcemano/ro:10
ng-ui:
charm: osm-ng-ui
- channel: latest/candidate
+ channel: 10.0/stable
scale: 3
series: kubernetes
resources:
image: opensourcemano/ng-ui:10
lcm:
charm: osm-lcm
- channel: latest/candidate
+ channel: 10.0/stable
scale: 3
series: kubernetes
options:
@@ -99,7 +99,7 @@
image: opensourcemano/lcm:10
mon:
charm: osm-mon
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
options:
@@ -110,7 +110,7 @@
image: opensourcemano/mon:10
pol:
charm: osm-pol
- channel: latest/candidate
+ channel: 10.0/stable
scale: 3
series: kubernetes
options:
@@ -119,7 +119,7 @@
image: opensourcemano/pol:10
pla:
charm: osm-pla
- channel: latest/candidate
+ channel: 10.0/stable
scale: 3
series: kubernetes
options:
@@ -128,7 +128,7 @@
image: opensourcemano/pla:10
prometheus:
charm: osm-prometheus
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
storage:
@@ -137,12 +137,12 @@
default-target: "mon:8000"
grafana:
charm: osm-grafana
- channel: latest/candidate
+ channel: 10.0/stable
scale: 3
series: kubernetes
keystone:
charm: osm-keystone
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
resources:
keystone-image: opensourcemano/keystone:10
diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index c280e29..fcbf7a0 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -60,7 +60,7 @@
db: 50M
nbi:
charm: osm-nbi
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
options:
@@ -71,7 +71,7 @@
image: opensourcemano/nbi:10
ro:
charm: osm-ro
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
options:
@@ -80,14 +80,14 @@
image: opensourcemano/ro:10
ng-ui:
charm: osm-ng-ui
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
resources:
image: opensourcemano/ng-ui:10
lcm:
charm: osm-lcm
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
options:
@@ -97,7 +97,7 @@
image: opensourcemano/lcm:10
mon:
charm: osm-mon
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
options:
@@ -108,7 +108,7 @@
image: opensourcemano/mon:10
pol:
charm: osm-pol
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
options:
@@ -117,7 +117,7 @@
image: opensourcemano/pol:10
pla:
charm: osm-pla
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
options:
@@ -126,7 +126,7 @@
image: opensourcemano/pla:10
prometheus:
charm: osm-prometheus
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
storage:
@@ -135,12 +135,12 @@
default-target: "mon:8000"
grafana:
charm: osm-grafana
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
series: kubernetes
keystone:
charm: osm-keystone
- channel: latest/candidate
+ channel: 10.0/stable
scale: 1
resources:
keystone-image: opensourcemano/keystone:10
diff --git a/installers/charm/keystone/src/charm.py b/installers/charm/keystone/src/charm.py
index 2a0a521..f908bbf 100755
--- a/installers/charm/keystone/src/charm.py
+++ b/installers/charm/keystone/src/charm.py
@@ -237,9 +237,9 @@
credential_keys, fernet_keys = self._get_keys()
- for (key_id, value) in enumerate(credential_keys):
+ for key_id, value in enumerate(credential_keys):
credentials_files_builder.add_file(str(key_id), value)
- for (key_id, value) in enumerate(fernet_keys):
+ for key_id, value in enumerate(fernet_keys):
fernet_files_builder.add_file(str(key_id), value)
return credentials_files_builder.build(), fernet_files_builder.build()
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 0e33ff8..a30c306 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -56,7 +56,7 @@
OSM_BUNDLE=ch:osm
OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=10.0/candidate
+CHARMHUB_CHANNEL=10.0/stable
unset TAG
function check_arguments(){