Add option to configure iso domain on engine (#89)

Fix #88
rhevm-qe-automation · Dec 1, 2016 · 7cadcf7 · 7cadcf7
1 parent 2730551
commit 7cadcf7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/roles/ovirt-engine-setup/README.md b/roles/ovirt-engine-setup/README.md
@@ -38,6 +38,12 @@ ovirt_engine_dwh_db_port: Server listening port (default 5432)
 ovirt_engine_dwh_db_name: DB name for ovirt-engine-dwh (default: 'ovirt_engine_history')
 ovirt_engine_dwh_db_user: DB user which can access ovirt-engine-dwh DB (default: 'ovirt_engine_history')
 ovirt_engine_dwh_db_password: password for user of ovirt-engine DB
+
+# ISO domain related options
+ovirt_engine_configure_iso_domain: Whether to confiure ISO domain on engine (default False)
+ovirt_engine_iso_domain_path: Create local ISO domain on engine machine (default: /var/lib/exports/iso)
+ovirt_engine_iso_domain_name: Name of ISO domain (default: 'ISO_DOMAIN')
+ovirt_engine_iso_domain_acl: ACL permissions for ISO domain mount point (default: '0.0.0.0/0.0.0.0(rw)')
 ```
 
 Dependencies

diff --git a/roles/ovirt-engine-setup/defaults/main.yml b/roles/ovirt-engine-setup/defaults/main.yml
@@ -16,3 +16,8 @@ ovirt_engine_dwh_db_port: 5432
 ovirt_engine_dwh_db_name: 'ovirt_engine_history'
 ovirt_engine_dwh_db_user: 'ovirt_engine_history'
 ovirt_engine_dwh_db_password: '37xmBKECANQGm0z3SfylMp'
+
+ovirt_engine_configure_iso_domain: false
+ovirt_engine_iso_domain_path: '/var/lib/exports/iso'
+ovirt_engine_iso_domain_name: 'ISO_DOMAIN'
+ovirt_engine_iso_domain_acl: '0.0.0.0/0.0.0.0(rw)'
diff --git a/roles/ovirt-engine-setup/templates/answerfile_3.6_basic.txt.j2 b/roles/ovirt-engine-setup/templates/answerfile_3.6_basic.txt.j2
@@ -28,14 +28,21 @@ OVESETUP_DB/securedHostValidation=bool:False
 OVESETUP_ENGINE_CORE/enable=bool:True
 OVESETUP_CORE/engineStop=none:None
 OVESETUP_SYSTEM/memCheckEnabled=bool:False
-OVESETUP_SYSTEM/nfsConfigEnabled=bool:True
 OVESETUP_PKI/organization=str:{{ ovirt_engine_organization }}
 OVESETUP_PKI/renew=none:None
-OVESETUP_CONFIG/isoDomainName=str:ISO_DOMAIN
+{% if ovirt_engine_configure_iso_domain %}
+OVESETUP_CONFIG/isoDomainName=str:{{ ovirt_engine_iso_domain_name }}
+OVESETUP_CONFIG/isoDomainACL=str:{{ ovirt_engine_iso_domain_acl }}
+OVESETUP_CONFIG/isoDomainMountPoint=str:{{ ovirt_engine_iso_domain_path }}
+OVESETUP_SYSTEM/nfsConfigEnabled=bool:True
+{% else %}
+OVESETUP_CONFIG/isoDomainName=none:None
+OVESETUP_CONFIG/isoDomainACL=none:None
+OVESETUP_CONFIG/isoDomainMountPoint=none:None
+OVESETUP_SYSTEM/nfsConfigEnabled=bool:False
+{% endif %}
 OVESETUP_CONFIG/engineHeapMax=str:1024M
 OVESETUP_CONFIG/adminPassword=str:{{ ovirt_engine_admin_password }}
-OVESETUP_CONFIG/isoDomainACL=str:*(rw)
-OVESETUP_CONFIG/isoDomainMountPoint=str:/var/lib/exports/iso
 OVESETUP_CONFIG/engineDbBackupDir=str:/var/lib/ovirt-engine/backups
 OVESETUP_CONFIG/engineHeapMin=str:1024M
 OVESETUP_AIO/configure=none:None

diff --git a/roles/ovirt-engine-setup/templates/answerfile_4.0_basic.txt.j2 b/roles/ovirt-engine-setup/templates/answerfile_4.0_basic.txt.j2
@@ -40,12 +40,20 @@ OVESETUP_SYSTEM/memCheckEnabled=bool:False
 OVESETUP_SYSTEM/nfsConfigEnabled=bool:False
 OVESETUP_PKI/organization=str:{{ ovirt_engine_organization }}
 OVESETUP_PKI/renew=none:None
+{% if ovirt_engine_configure_iso_domain %}
+OVESETUP_CONFIG/isoDomainName=str:{{ ovirt_engine_iso_domain_name }}
+OVESETUP_CONFIG/isoDomainACL=str:{{ ovirt_engine_iso_domain_acl }}
+OVESETUP_CONFIG/isoDomainMountPoint=str:{{ ovirt_engine_iso_domain_path }}
+OVESETUP_SYSTEM/nfsConfigEnabled=bool:True
+{% else %}
 OVESETUP_CONFIG/isoDomainName=none:None
+OVESETUP_CONFIG/isoDomainACL=none:None
+OVESETUP_CONFIG/isoDomainMountPoint=none:None
+OVESETUP_SYSTEM/nfsConfigEnabled=bool:False
+{% endif %}
 OVESETUP_CONFIG/engineHeapMax=str:1024M
 OVESETUP_CONFIG/ignoreVdsgroupInNotifier=none:None
 OVESETUP_CONFIG/adminPassword=str:{{ ovirt_engine_admin_password }}
-OVESETUP_CONFIG/isoDomainACL=none:None
-OVESETUP_CONFIG/isoDomainMountPoint=none:None
 OVESETUP_CONFIG/engineDbBackupDir=str:/var/lib/ovirt-engine/backups
 OVESETUP_CONFIG/engineHeapMin=str:1024M
 OVESETUP_CONFIG/imageioProxyConfig=bool:True