Merge pull request #31 from apsivam/master

CentOS 7 Compatibility

roles/ipaclient/vars/CentOS-7.yml

+# defaults file for ipaclient
+# vars/rhel.yml
+ipaclient_packages: [ "ipa-client", "libselinux-python" ]
+#ansible_python_interpreter: '/usr/bin/python2'

roles/ipareplica/vars/CentOS-7.yml

+# defaults file for ipareplica
+# vars/RedHat-7.yml
+ipareplica_packages: [ "ipa-server", "libselinux-python" ]
+ipareplica_packages_dns: [ "ipa-server-dns" ]
+ipareplica_packages_adtrust: [ "ipa-server-trust-ad" ]
\ No newline at end of file

roles/ipaserver/library/ipaserver_setup_ca.py

@@ -188,7 +188,7 @@ def main():
     # setup CA ##############################################################
 
     with redirect_stdout(ansible_log):
-        if NUM_VERSION >= 40604:
+        if NUM_VERSION >= 40504:
             custodia = custodiainstance.get_custodia_instance(
                 options, custodiainstance.CustodiaModes.MASTER_PEER)
             custodia.create_instance()
@@ -200,7 +200,7 @@ def main():
                               if n in options.__dict__}
                 write_cache(cache_vars)
 
-            if NUM_VERSION >= 40604:
+            if NUM_VERSION >= 40504:
                 ca.install_step_0(False, None, options, custodia=custodia)
             else:
                 ca.install_step_0(False, None, options)
@@ -225,7 +225,7 @@ def main():
 
         if options.setup_ca:
             with redirect_stdout(ansible_log):
-                if NUM_VERSION >= 40604:
+                if NUM_VERSION >= 40504:
                     ca.install_step_1(False, None, options, custodia=custodia)
                 else:
                     ca.install_step_1(False, None, options)

roles/ipaserver/library/ipaserver_setup_kra.py

@@ -57,6 +57,7 @@ def main():
             hostname=dict(required=True),
             setup_ca=dict(required=True, type='bool'),
             setup_kra=dict(required=True, type='bool'),
+            realm=dict(required=True),
         ),
     )
 
@@ -69,6 +70,8 @@ def main():
     options.host_name = ansible_module.params.get('hostname')
     options.setup_ca = ansible_module.params.get('setup_ca')
     options.setup_kra = ansible_module.params.get('setup_kra')
+    options.realm_name = ansible_module.params.get('realm')
+    options.promote = False  # first master, no promotion
 
     # init ##########################################################
 
@@ -80,7 +83,7 @@ def main():
     # setup kra #####################################################
 
     with redirect_stdout(ansible_log):
-        if NUM_VERSION >= 40604:
+        if NUM_VERSION >= 40504:
             custodia = custodiainstance.get_custodia_instance(
                 options, custodiainstance.CustodiaModes.MASTER_PEER)
             custodia.create_instance()

roles/ipaserver/tasks/install.yml

@@ -287,6 +287,7 @@
       setup_ca: "{{ result_ipaserver_test.setup_ca }}"
       dm_password: "{{ ipadm_password }}"
       setup_kra: "{{ result_ipaserver_test.setup_kra }}"
+      realm: "{{ result_ipaserver_test.realm }}"
     when: result_ipaserver_test.setup_kra | bool
 
   - name: Install - Setup DNS

roles/ipaserver/vars/CentOS-7.yml

+# defaults file for ipaserver
+# vars/rhel.yml
+ipaserver_packages: [ "ipa-server", "libselinux-python" ]
+ipaserver_packages_dns: [ "ipa-server-dns" ]
+ipaserver_packages_adtrust: [ "ipa-server-trust-ad" ]
\ No newline at end of file