Add image_username and image_password to charms
This commit will allow us to pull images for OSM components from a
private docker registry, protected with username and password
Change-Id: I854028d6abbb1cae07c61692ba73d08825763212
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/charm/pla/config.yaml b/installers/charm/pla/config.yaml
index e0aeca4..f3318fc 100644
--- a/installers/charm/pla/config.yaml
+++ b/installers/charm/pla/config.yaml
@@ -20,6 +20,14 @@
description: Docker image name
type: string
default: opensourcemano/pla:8
+ image_username:
+ description: Docker repository username
+ type: string
+ default: ""
+ image_password:
+ description: Docker repository password
+ type: string
+ default: ""
port:
description: Port number
type: int
diff --git a/installers/charm/pla/hooks/install b/installers/charm/pla/hooks/install
deleted file mode 120000
index 25b1f68..0000000
--- a/installers/charm/pla/hooks/install
+++ /dev/null
@@ -1 +0,0 @@
-../src/charm.py
\ No newline at end of file
diff --git a/installers/charm/pla/hooks/start b/installers/charm/pla/hooks/start
deleted file mode 120000
index 25b1f68..0000000
--- a/installers/charm/pla/hooks/start
+++ /dev/null
@@ -1 +0,0 @@
-../src/charm.py
\ No newline at end of file
diff --git a/installers/charm/pla/hooks/upgrade-charm b/installers/charm/pla/hooks/upgrade-charm
deleted file mode 120000
index 25b1f68..0000000
--- a/installers/charm/pla/hooks/upgrade-charm
+++ /dev/null
@@ -1 +0,0 @@
-../src/charm.py
\ No newline at end of file
diff --git a/installers/charm/pla/lib/ops b/installers/charm/pla/lib/ops
deleted file mode 120000
index d934193..0000000
--- a/installers/charm/pla/lib/ops
+++ /dev/null
@@ -1 +0,0 @@
-../mod/operator/ops
\ No newline at end of file
diff --git a/installers/charm/pla/mod/operator b/installers/charm/pla/mod/operator
deleted file mode 160000
index a84ce87..0000000
--- a/installers/charm/pla/mod/operator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a84ce8776b368a8b2bccdb173716e342db9a6b36
diff --git a/installers/charm/pla/src/charm.py b/installers/charm/pla/src/charm.py
index 785766d..16e7303 100755
--- a/installers/charm/pla/src/charm.py
+++ b/installers/charm/pla/src/charm.py
@@ -29,9 +29,6 @@
)
-sys.path.append("lib")
-
-
logger = logging.getLogger(__name__)
@@ -85,7 +82,11 @@
config = self.framework.model.config
ports = [
- {"name": "port", "containerPort": config["port"], "protocol": "TCP", },
+ {
+ "name": "port",
+ "containerPort": config["port"],
+ "protocol": "TCP",
+ },
]
config_spec = {
@@ -103,7 +104,11 @@
"containers": [
{
"name": self.framework.model.app.name,
- "image": config["image"],
+ "imageDetails": {
+ "imagePath": config["image"],
+ "username": config["image_username"],
+ "password": config["image_password"],
+ },
"ports": ports,
"config": config_spec,
}
@@ -136,9 +141,7 @@
self._apply_spec()
def on_mongo_relation_changed(self, event):
- mongodb_uri = event.relation.data[event.unit].get(
- "connection_string"
- )
+ mongodb_uri = event.relation.data[event.unit].get("connection_string")
if mongodb_uri and self.state.mongodb_uri != mongodb_uri:
self.state.mongodb_uri = mongodb_uri
self._apply_spec()