working with quotes and comments

templates/devportal-silent-install.conf.j2

diff --git a/templates/devportal-silent-install.conf.j2 b/templates/devportal-silent-install.conf.j2
index ab9bedf..ca73f62 100644
--- a/templates/devportal-silent-install.conf.j2
+++ b/templates/devportal-silent-install.conf.j2
@@ -1,27 +1,27 @@
 HOSTIP=$(hostname -i)
 PG_NAME=devportal
 PG_USER={{ devportal_pg_user | default(pg_user) }}
-PG_PWD={{ devportal_pg_pass | default(pg_pass) }}
+PG_PWD='{{ devportal_pg_pass | default(pg_pass) }}'
 
 PG_HOST={{ dp_pg_ip }}
 DEFAULT_DB=postgres
 
 DRUPAL_PG_USER={{ drupal_pg_user }}
-DRUPAL_PG_PASS={{ drupal_pg_pass }}
+DRUPAL_PG_PASS='{{ drupal_pg_pass }}'
 
 DEVPORTAL_ADMIN_FIRSTNAME={{ dp_admin_firstname }}
 DEVPORTAL_ADMIN_LASTNAME={{ dp_admin_lastname }}
 DEVPORTAL_ADMIN_USERNAME={{ dp_admin_username }}
-DEVPORTAL_ADMIN_PWD={{ dp_admin_pwd }}
+DEVPORTAL_ADMIN_PWD='{{ dp_admin_pwd }}'
 DEVPORTAL_ADMIN_EMAIL={{ dp_admin_email }}
 
 EDGE_ORG={{ org_name }}
 MGMT_URL=http://{{ local_mgmt_ip }}:8080/v1
 DEVADMIN_USER={{ dp_devadmin_user }}
-DEVADMIN_PWD={{ dp_devadmin_pwd }}
+DEVADMIN_PWD='{{ dp_devadmin_pwd }}'
 
 SMTPHOST={{ opdk_smtp_host }}
 SMTPSSL={{ opdk_smtp_ssl }}
 SMTPPORT={{ opdk_smtp_port }}
 SMTPUSER={{ opdk_smtp_user | default(dp_devadmin_user) }}
-SMTPPASSWORD={{ opdk_smtp_password | default(dp_devadmin_pwd) }}
+SMTPPASSWORD='{{ opdk_smtp_password | default(dp_devadmin_pwd) }}'