projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes bug 1254 and bug 1247
[osm/devops.git]
/
installers
/
charm
/
ng-ui
/
src
/
charm.py
diff --git
a/installers/charm/ng-ui/src/charm.py
b/installers/charm/ng-ui/src/charm.py
index
33d9ade
..
ce48927
100755
(executable)
--- a/
installers/charm/ng-ui/src/charm.py
+++ b/
installers/charm/ng-ui/src/charm.py
@@
-63,7
+63,7
@@
class NGUICharm(CharmBase):
# Only apply the spec if this unit is a leader.
unit = self.model.unit
if not unit.is_leader():
# Only apply the spec if this unit is a leader.
unit = self.model.unit
if not unit.is_leader():
- unit.status = ActiveStatus("
R
eady")
+ unit.status = ActiveStatus("
r
eady")
return
if not self.state.nbi_host or not self.state.nbi_port:
unit.status = WaitingStatus("Waiting for NBI")
return
if not self.state.nbi_host or not self.state.nbi_port:
unit.status = WaitingStatus("Waiting for NBI")
@@
-72,11
+72,11
@@
class NGUICharm(CharmBase):
new_spec = self.make_pod_spec()
if new_spec == self.state.spec:
new_spec = self.make_pod_spec()
if new_spec == self.state.spec:
- unit.status = ActiveStatus("
R
eady")
+ unit.status = ActiveStatus("
r
eady")
return
self.framework.model.pod.set_spec(new_spec)
self.state.spec = new_spec
return
self.framework.model.pod.set_spec(new_spec)
self.state.spec = new_spec
- unit.status = ActiveStatus("
R
eady")
+ unit.status = ActiveStatus("
r
eady")
def make_pod_spec(self):
config = self.framework.model.config
def make_pod_spec(self):
config = self.framework.model.config
@@
-129,7
+129,7
@@
class NGUICharm(CharmBase):
]
port = config["https_port"] if ssl_enabled else config["port"]
ports = [
]
port = config["https_port"] if ssl_enabled else config["port"]
ports = [
- {"name": "port", "containerPort": port, "protocol": "TCP",},
+ {"name": "port", "containerPort": port, "protocol": "TCP",
},
]
kubernetes = {
]
kubernetes = {