projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make Charmed Installer Idempotent
[osm/devops.git]
/
installers
/
charm
/
bundles
/
osm
/
bundle.yaml
diff --git
a/installers/charm/bundles/osm/bundle.yaml
b/installers/charm/bundles/osm/bundle.yaml
index
71465f6
..
6207fd8
100644
(file)
--- a/
installers/charm/bundles/osm/bundle.yaml
+++ b/
installers/charm/bundles/osm/bundle.yaml
@@
-125,8
+125,12
@@
applications:
series: kubernetes
options:
port: 80
series: kubernetes
options:
port: 80
+ https_port: 443
server_name: localhost
client_max_body_size: 15M
server_name: localhost
client_max_body_size: 15M
+ annotations:
+ gui-x: 500
+ gui-y: 100
lcm-k8s:
charm: "%(prefix)s/lcm-k8s%(suffix)s"
channel: "%(channel)s"
lcm-k8s:
charm: "%(prefix)s/lcm-k8s%(suffix)s"
channel: "%(channel)s"
@@
-141,7
+145,6
@@
applications:
vca_password: secret
vca_pubkey: pubkey
vca_cacert: cacert
vca_password: secret
vca_pubkey: pubkey
vca_cacert: cacert
- vca_apiproxy: apiproxy
use_external_vca: false
DATABASE_COMMONKEY: osm
annotations:
use_external_vca: false
DATABASE_COMMONKEY: osm
annotations:
@@
-251,3
+254,5
@@
relations:
- "mongodb-k8s:mongo"
- - "pla:mysql"
- "mariadb-k8s:mysql"
- "mongodb-k8s:mongo"
- - "pla:mysql"
- "mariadb-k8s:mysql"
+ - - 'ng-ui:nbi'
+ - 'nbi-k8s:nbi'