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/ng-ui/src/charm.py b/installers/charm/ng-ui/src/charm.py
index d9ad8f2..6f5ca5b 100755
--- a/installers/charm/ng-ui/src/charm.py
+++ b/installers/charm/ng-ui/src/charm.py
@@ -32,9 +32,6 @@
)
-sys.path.append("lib")
-
-
logger = logging.getLogger(__name__)
@@ -130,7 +127,11 @@
]
port = config["https_port"] if ssl_enabled else config["port"]
ports = [
- {"name": "port", "containerPort": port, "protocol": "TCP", },
+ {
+ "name": "port",
+ "containerPort": port,
+ "protocol": "TCP",
+ },
]
kubernetes = {
@@ -166,7 +167,11 @@
"containers": [
{
"name": self.framework.model.app.name,
- "image": "{}".format(config["image"]),
+ "imageDetails": {
+ "imagePath": config["image"],
+ "username": config["image_username"],
+ "password": config["image_password"],
+ },
"ports": ports,
"kubernetes": kubernetes,
"files": files,