Fix bug 2142: Debug mode in Pebble Charms is not working
Change-Id: Icca7e2b3a38b0c9ca4859138931e2c92566fd1d9
Signed-off-by: Guillermo Calvino <guillermo.calvino@canonical.com>
diff --git a/installers/charm/osm-lcm/src/charm.py b/installers/charm/osm-lcm/src/charm.py
index 8c8c6e1..4a362a6 100755
--- a/installers/charm/osm-lcm/src/charm.py
+++ b/installers/charm/osm-lcm/src/charm.py
@@ -102,7 +102,8 @@
# Check if the container is ready.
# Eventually it will become ready after the first pebble-ready event.
check_container_ready(self.container)
- self._configure_service(self.container)
+ if not self.debug_mode.started:
+ self._configure_service(self.container)
# Update charm status
self._on_update_status()
diff --git a/installers/charm/osm-mon/src/charm.py b/installers/charm/osm-mon/src/charm.py
index 00444f8..d926776 100755
--- a/installers/charm/osm-mon/src/charm.py
+++ b/installers/charm/osm-mon/src/charm.py
@@ -116,8 +116,8 @@
# Check if the container is ready.
# Eventually it will become ready after the first pebble-ready event.
check_container_ready(self.container)
-
- self._configure_service(self.container)
+ if not self.debug_mode.started:
+ self._configure_service(self.container)
# Update charm status
self._on_update_status()
except CharmError as e:
diff --git a/installers/charm/osm-nbi/files/vscode-workspace.json b/installers/charm/osm-nbi/files/vscode-workspace.json
index 4f92455..f2baa1d 100644
--- a/installers/charm/osm-nbi/files/vscode-workspace.json
+++ b/installers/charm/osm-nbi/files/vscode-workspace.json
@@ -1,8 +1,14 @@
{
"folders": [
- {"path": "/usr/lib/python3/dist-packages/osm_nbi"},
- {"path": "/usr/lib/python3/dist-packages/osm_common"},
- {"path": "/usr/lib/python3/dist-packages/osm_im"},
+ {
+ "path": "/usr/lib/python3/dist-packages/osm_nbi"
+ },
+ {
+ "path": "/usr/lib/python3/dist-packages/osm_common"
+ },
+ {
+ "path": "/usr/lib/python3/dist-packages/osm_im"
+ },
],
"settings": {},
"launch": {
@@ -13,7 +19,7 @@
"type": "python",
"request": "launch",
"module": "osm_nbi.nbi",
- "justMyCode": False,
+ "justMyCode": false,
}
]
}
diff --git a/installers/charm/osm-nbi/src/charm.py b/installers/charm/osm-nbi/src/charm.py
index 454b155..23ab054 100755
--- a/installers/charm/osm-nbi/src/charm.py
+++ b/installers/charm/osm-nbi/src/charm.py
@@ -113,7 +113,8 @@
# Eventually it will become ready after the first pebble-ready event.
check_container_ready(self.container)
- self._configure_service(self.container)
+ if not self.debug_mode.started:
+ self._configure_service(self.container)
self._update_ingress_config()
self._update_nbi_relation()
# Update charm status
diff --git a/installers/charm/osm-pol/src/charm.py b/installers/charm/osm-pol/src/charm.py
index 1c66157..2749ddb 100755
--- a/installers/charm/osm-pol/src/charm.py
+++ b/installers/charm/osm-pol/src/charm.py
@@ -90,7 +90,8 @@
# Eventually it will become ready after the first pebble-ready event.
check_container_ready(self.container)
- self._configure_service(self.container)
+ if not self.debug_mode.started:
+ self._configure_service(self.container)
# Update charm status
self._on_update_status()
except CharmError as e:
diff --git a/installers/charm/osm-ro/src/charm.py b/installers/charm/osm-ro/src/charm.py
index c19281e..7b8acea 100755
--- a/installers/charm/osm-ro/src/charm.py
+++ b/installers/charm/osm-ro/src/charm.py
@@ -102,7 +102,8 @@
check_container_ready(self.container)
self._configure_certificates()
- self._configure_service()
+ if not self.debug_mode.started:
+ self._configure_service()
self._update_ro_relation()
# Update charm status