Skip to content

Commit ac5750e

Browse files
authored
Add support to provide notification email during rhods installation (#349)
Signed-off-by: Arthy Loganathan <[email protected]>
1 parent 83f4156 commit ac5750e

File tree

3 files changed

+40
-2
lines changed

3 files changed

+40
-2
lines changed

utils/scripts/ocm/ocm.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def __init__(self, args={}):
5050
self.taints = args.get("taints")
5151
self.pool_name = args.get("pool_name")
5252
self.reuse_machine_pool = args.get("reuse_machine_pool")
53+
self.notification_email = args.get("notification_email")
5354

5455
ocm_env = glob.glob(dir_path+"/../../../ocm.json.*")
5556
if ocm_env != []:
@@ -424,7 +425,13 @@ def uninstall_addon(self, addon_name="managed-odh", exit_on_failure=True):
424425

425426
def install_rhods(self):
426427
"""Installs RHODS addon"""
427-
self.install_addon(addon_name="managed-odh")
428+
add_vars = {
429+
"NOTIFICATION_EMAIL": self.notification_email
430+
}
431+
self.install_addon(addon_name="managed-odh",
432+
template_filename="install_addon_rhods.jinja",
433+
output_filename="install_operator_rhods.json",
434+
add_replace_vars=add_vars)
428435

429436
def uninstall_rhods(self):
430437
"""Uninstalls RHODS addon"""
@@ -779,7 +786,9 @@ def install_rhods_addon(self):
779786

780787
def install_gpu_addon(self):
781788
if not self.is_addon_installed(addon_name="gpu-operator-certified-addon"):
782-
self.install_addon(addon_name="gpu-operator-certified-addon")
789+
self.install_addon(addon_name="gpu-operator-certified-addon",
790+
template_filename="install_addon_gpu.jinja",
791+
output_filename="install_operator_gpu.json")
783792
self.wait_for_addon_installation_to_complete(addon_name="gpu-operator-certified-addon")
784793
# Waiting 5 minutes to ensure all the services are up
785794
time.sleep(300)
@@ -1021,6 +1030,10 @@ def update_notification_email_address(self, addon_name, email_address, exit_on_f
10211030
help="osd cluster name",
10221031
action="store", dest="cluster_name",
10231032
required=True)
1033+
required_install_rhods_parser.add_argument("--notification-email",
1034+
help="Notification email address",
1035+
action="store", dest="notification_email",
1036+
required=True)
10241037
install_rhods_parser.set_defaults(func=ocm_obj.install_rhods_addon)
10251038

10261039
#Argument parsers for install_rhods_addon
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"kind": "Cluster",
3+
"href": "/api/clusters_mgmt/v1/clusters/{{ CLUSTER_ID }}",
4+
"addon": {
5+
"kind": "AddOn",
6+
"href": "/api/clusters_mgmt/v1/addons/{{ ADDON_NAME }}",
7+
"id": "{{ ADDON_NAME }}" }
8+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"kind": "Cluster",
3+
"href": "/api/clusters_mgmt/v1/clusters/{{ CLUSTER_ID }}",
4+
"addon": {
5+
"kind": "AddOn",
6+
"href": "/api/clusters_mgmt/v1/addons/{{ ADDON_NAME }}",
7+
"id": "{{ ADDON_NAME }}" },
8+
"parameters": {
9+
"items":
10+
[
11+
{
12+
"id": "notification-email",
13+
"value": "{{ NOTIFICATION_EMAIL }}"
14+
}
15+
]
16+
}
17+
}

0 commit comments

Comments
 (0)