diff --git a/roles/ipaserver/tasks/install-1.yml b/roles/ipaserver/tasks/install-1.yml
deleted file mode 100644
index 7af5dfab3a37d1e5ae282baa83d7b7e334c718b0..0000000000000000000000000000000000000000
--- a/roles/ipaserver/tasks/install-1.yml
+++ /dev/null
@@ -1,153 +0,0 @@
----
-# tasks file for ipaserver
-
-- name: Install - Install IPA server package
- package:
- name: "{{ item }}"
- state: present
- with_items: "{{ ipaserver_packages }}"
-
-- name: Install - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
-
-- name: Install - Server installation test
- server_test:
- # basic
- dm_password: "{{ ipaserver_dm_password }}"
- password: "{{ ipaserver_password }}"
-# ip_addresses: "{{ ipaserver_ip_addresses | default([]) }}"
- domain: "{{ ipaserver_domain | default(omit)}}"
- realm: "{{ ipaserver_realm | default(omit)}}"
- hostname: "{{ ipaserver_hostname | default(ansible_fqdn) }}"
- ca_cert_file: "{{ ipaserver_ca_cert_file | default(omit) }}"
- no_host_dns: "{{ ipaserver_no_host_dns }}"
- #
- setup_adtrust: "{{ ipaserver_setup_adtrust }}"
- setup_kra: "{{ ipaserver_setup_kra }}"
- setup_dns: "{{ ipaserver_setup_dns }}"
- #
- no_pkinit: "{{ ipaserver_no_pkinit }}"
- dirserv_config_file: "{{ ipaserver_dirserv_config_file | default(omit) }}"
- # ssl certificate
- dirserv_cert_file: "{{ ipaserver_dirserv_cert_file | default(omit) }}"
- dirserv_pin: "{{ ipaserver_dirserv_pin | default(omit) }}"
- dirserv_cert_name: "{{ ipaserver_dirserv_cert_name | default(omit) }}"
- http_cert_file: "{{ ipaserver_http_cert_file | default(omit) }}"
- http_pin: "{{ ipaserver_http_pin | default(omit) }}"
- http_cert_name: "{{ ipaserver_http_cert_name | default(omit) }}"
- pkinit_cert_file: "{{ ipaserver_pkinit_cert_file | default(omit) }}"
- pkinit_pin: "{{ ipaserver_pkinit_pin | default(omit) }}"
- pkinit_cert_name: "{{ ipaserver_pkinit_cert_name | default(omit) }}"
- # client
- no_ntp: "{{ ipaserver_no_ntp }}"
- # certificate system
- external_ca: "{{ ipaserver_external_ca | default(omit) }}"
- external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
- subject_base: "{{ ipaserver_subject_base | default(omit) }}"
- ca_subject: "{{ ipaserver_ca_subject | default(omit) }}"
- # dns
- allow_zone_overlap: "{{ ipaserver_allow_zone_overlap }}"
- reverse_zones: "{{ ipaserver_reverse_zones | default([]) }}"
- no_reverse: "{{ ipaserver_no_reverse }}"
- auto_reverse: "{{ ipaserver_auto_reverse }}"
- zonemgr: "{{ ipaserver_zonemgr | default(omit) }}"
- forwarders: "{{ ipaserver_forwarders | default([]) }}"
- no_forwarders: "{{ ipaserver_no_forwarders }}"
- auto_forwarders: "{{ ipaserver_auto_forwarders }}"
- forward_policy: "{{ ipaserver_forward_policy | default(first) }}"
- # repair
- allow_repair: "{{ ipaserver_allow_repair }}"
-# # compat_mode
-# compat_mode: "{{ ipaserver_compat_mode }}"
- register: server_test
-
-##
-
-- block:
-
- - name: Install - Master password passthrough or creation
- no_log: yes
- master_password:
- dm_password: "{{ ipaserver_dm_password }}"
- master_password: "{{ ipaserver_master_password | default(omit) }}"
- register: master_password
-
-# - name: Install - Create directory server instance
-# create_ds:
-
- - name: Install - Install
- server_install:
- # basic
- dm_password: "{{ ipaserver_dm_password }}"
- password: "{{ ipaserver_password }}"
- master_password: "{{ master_password.value }}"
-# ip_addresses: "{{ ipaserver_ip_addresses | default([]) }}"
- ip_addresses: "{{ server_test.ip_addresses }}"
- domain: "{{ server_test.domain }}"
- realm: "{{ server_test.realm }}"
- hostname: "{{ server_test.hostname }}"
- ca_cert_file: "{{ ipaserver_ca_cert_file | default(omit) }}"
- no_host_dns: "{{ server_test.no_host_dns }}"
- # server
- setup_adtrust: "{{ server_test.setup_adtrust }}"
- setup_kra: "{{ server_test.setup_kra }}"
- setup_dns: "{{ ipaserver_setup_dns }}"
- idstart: "{{ ipaserver_idstart | default(omit) }}"
- idmax: "{{ ipaserver_idmax | default(omit) }}"
- no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
- no_pkinit: "{{ ipaserver_no_pkinit }}"
- no_ui_redirect: "{{ ipaserver_no_ui_redirect }}"
- dirserv_config_file: "{{ ipaserver_dirserv_config_file | default(omit) }}"
- # ssl certificate
- dirserv_cert_file: "{{ ipaserver_dirserv_cert_file | default(omit) }}"
- dirserv_pin: "{{ ipaserver_dirserv_pin | default(omit) }}"
- dirserv_cert_name: "{{ ipaserver_dirserv_cert_name | default(omit) }}"
- http_cert_file: "{{ ipaserver_http_cert_file | default(omit) }}"
- http_pin: "{{ ipaserver_http_pin | default(omit) }}"
- http_cert_name: "{{ ipaserver_http_cert_name | default(omit) }}"
- pkinit_cert_file: "{{ ipaserver_pkinit_cert_file | default(omit) }}"
- pkinit_pin: "{{ ipaserver_pkinit_pin | default(omit) }}"
- pkinit_cert_name: "{{ ipaserver_pkinit_cert_name | default(omit) }}"
- # client
- mkhomedir: "{{ ipaserver_mkhomedir }}"
- no_ntp: "{{ ipaserver_no_ntp }}"
- ssh_trust_dns: "{{ ipaserver_ssh_trust_dns }}"
- no_ssh: "{{ ipaserver_no_ssh }}"
- no_sshd: "{{ ipaserver_no_sshd }}"
- no_dns_sshfp: "{{ ipaserver_no_dns_sshfp }}"
- # certificate system
- external_ca: "{{ ipaserver_external_ca | default(omit) }}"
- external_ca_type: "{{ ipaserver_external_ca_type | default('generic') }}"
- external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
- subject_base: "{{ ipaserver_subject_base | default(omit) }}"
- ca_subject: "{{ server_test.ca_subject | default(omit) }}"
- ca_signing_algorithm: "{{ ipaserver_ca_signing_algorithm | default(omit) }}"
- # dns
- allow_zone_overlap: "{{ ipaserver_allow_zone_overlap }}"
- reverse_zone: "{{ ipaserver_reverse_zone | default(omit) }}"
- no_reverse: "{{ ipaserver_no_reverse }}"
- auto_reverse: "{{ ipaserver_auto_reverse }}"
- zonemgr: "{{ ipaserver_zonemgr | default(omit) }}"
- forwarders: "{{ ipaserver_forwarders | default([]) }}"
- no_forwarders: "{{ ipaserver_no_forwarders }}"
- auto_forwarders: "{{ ipaserver_auto_forwarders }}"
- forward_policy: "{{ ipaserver_forward_policy | default(first) }}"
- no_dnssec_validation: "{{ ipaserver_no_dnssec_validation }}"
- # ad trust
- enable_compat: "{{ ipaserver_enable_compat }}"
- netbios_name: "{{ ipaserver_netbios_name | default(omit) }}"
- rid_base: "{{ ipaserver_rid_base | default(omit) }}"
- secondary_rid_base: "{{ ipaserver_secondary_rid_base | default(omit) }}"
-
- # additional
- hostname_overridden: "{{ server_test.hostname_overridden }}"
- update_hosts_file: "{{ server_test.update_hosts_file }}"
- setup_ca: "{{ server_test.setup_ca }}"
- allow_repair: "{{ ipaserver_allow_repair }}"
- reverse_zones: "{{ server_test.reverse_zones }}"
-
- - name: Install - Cleanup root IPA cache
- file:
- path: "/root/.ipa_cache"
- state: absent
diff --git a/roles/ipaserver/tasks/install-2.yml b/roles/ipaserver/tasks/install-2.yml
deleted file mode 100644
index 83afb294781bf6ce77d8929e28d21f074d8f8684..0000000000000000000000000000000000000000
--- a/roles/ipaserver/tasks/install-2.yml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-# tasks file for ipaserver
-
-- name: Install - Install IPA server package
- package:
- name: "{{ item }}"
- state: present
- with_items: "{{ ipaserver_packages }}"
-
-- name: Install - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
-
-- name: Install - Server installation
- server_install:
- # basic
- dm_password: "{{ ipaserver_dm_password }}"
- password: "{{ ipaserver_password }}"
- ip_addresses: "{{ ipaserver_ip_addresses | default([]) }}"
- domain: "{{ ipaserver_domain | default(omit)}}"
- realm: "{{ ipaserver_realm | default(omit)}}"
- hostname: "{{ ipaserver_hostname | default(ansible_fqdn) }}"
- ca_cert_file: "{{ ipaserver_ca_cert_file | default(omit) }}"
- no_host_dns: "{{ ipaserver_no_host_dns }}"
- #
- setup_adtrust: "{{ ipaserver_setup_adtrust }}"
- setup_kra: "{{ ipaserver_setup_kra }}"
- setup_dns: "{{ ipaserver_setup_dns }}"
- idstart: "{{ ipaserver_idstart | default(omit) }}"
- idmax: "{{ ipaserver_idmax | default(omit) }}"
- no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
- no_pkinit: "{{ ipaserver_no_pkinit }}"
- no_ui_redirect: "{{ ipaserver_no_ui_redirect }}"
- dirserv_config_file: "{{ ipaserver_dirserv_config_file | default(omit) }}"
- # ssl certificate
- dirserv_cert_file: "{{ ipaserver_dirserv_cert_file | default(omit) }}"
- dirserv_pin: "{{ ipaserver_dirserv_pin | default(omit) }}"
- dirserv_cert_name: "{{ ipaserver_dirserv_cert_name | default(omit) }}"
- http_cert_file: "{{ ipaserver_http_cert_file | default(omit) }}"
- http_pin: "{{ ipaserver_http_pin | default(omit) }}"
- http_cert_name: "{{ ipaserver_http_cert_name | default(omit) }}"
- pkinit_cert_file: "{{ ipaserver_pkinit_cert_file | default(omit) }}"
- pkinit_pin: "{{ ipaserver_pkinit_pin | default(omit) }}"
- pkinit_cert_name: "{{ ipaserver_pkinit_cert_name | default(omit) }}"
- # client
- mkhomedir: "{{ ipaserver_mkhomedir }}"
- no_ntp: "{{ ipaserver_no_ntp }}"
- ssh_trust_dns: "{{ ipaserver_ssh_trust_dns }}"
- no_ssh: "{{ ipaserver_no_ssh }}"
- no_sshd: "{{ ipaserver_no_sshd }}"
- no_dns_sshfp: "{{ ipaserver_no_dns_sshfp }}"
- # certificate system
- external_ca: "{{ ipaserver_external_ca | default(omit) }}"
- external_ca_type: "{{ ipaserver_external_ca_type | default('generic') }}"
- external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
- subject_base: "{{ ipaserver_subject_base | default(omit) }}"
- ca_subject: "{{ ipaserver_ca_subject | default(omit) }}"
- ca_signing_algorithm: "{{ ipaserver_ca_signing_algorithm | default(omit) }}"
- # dns
- allow_zone_overlap: "{{ ipaserver_allow_zone_overlap }}"
- reverse_zone: "{{ ipaserver_reverse_zone | default(omit) }}"
- no_reverse: "{{ ipaserver_no_reverse }}"
- auto_reverse: "{{ ipaserver_auto_reverse }}"
- zonemgr: "{{ ipaserver_zonemgr | default(omit) }}"
- forwarders: "{{ ipaserver_forwarders | default([]) }}"
- no_forwarders: "{{ ipaserver_no_forwarders }}"
- auto_forwarders: "{{ ipaserver_auto_forwarders }}"
- forward_policy: "{{ ipaserver_forward_policy | default(first) }}"
- no_dnssec_validation: "{{ ipaserver_no_dnssec_validation }}"
- # ad trust
- enable_compat: "{{ ipaserver_enable_compat }}"
- netbios_name: "{{ ipaserver_netbios_name | default(omit) }}"
- rid_base: "{{ ipaserver_rid_base | default(omit) }}"
- secondary_rid_base: "{{ ipaserver_secondary_rid_base | default(omit) }}"
- # additional
- #hostname_overridden: "{{ server_test.hostname_overridden }}"
- #update_hosts_file: "{{ server_test.update_hosts_file }}"
- #setup_ca: "{{ server_test.setup_ca }}"
- #allow_repair: "{{ ipaserver_allow_repair }}"
- #reverse_zones: "{{ server_test.reverse_zones }}"
- register: server_install
-
-##
-
-- name: Install - Cleanup root IPA cache
- file:
- path: "/root/.ipa_cache"
- state: absent
diff --git a/roles/ipaserver/tasks/install-ipaserver.yml b/roles/ipaserver/tasks/install-ipaserver.yml
deleted file mode 100644
index 1ad9881c09cd348c762f4d31551fd5fec5da1585..0000000000000000000000000000000000000000
--- a/roles/ipaserver/tasks/install-ipaserver.yml
+++ /dev/null
@@ -1,215 +0,0 @@
----
-# tasks file for ipaserver
-
-- name: Install - Install IPA server package
- package:
- name: "{{ item }}"
- state: present
- with_items: "{{ ipaserver_packages }}"
-
-- name: Install - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
-
-- name: Install - Server installation test
- server_test:
- # basic
- dm_password: "{{ ipaserver_dm_password }}"
- password: "{{ ipaserver_password }}"
-# ip_addresses: "{{ ipaserver_ip_addresses }}"
- domain: "{{ ipaserver_domain | default(omit)}}"
- realm: "{{ ipaserver_realm | default(omit)}}"
- hostname: "{{ ipaserver_hostname | default(ansible_fqdn) }}"
- ca_cert_file: "{{ ipaserver_ca_cert_file | default(omit) }}"
- no_host_dns: "{{ ipaserver_no_host_dns }}"
- #
-# setup_adtrust: "{{ ipaserver_setup_adtrust }}"
-# setup_kra: "{{ ipaserver_setup_kra }}"
- setup_dns: "{{ ipaserver_setup_dns }}"
- #
- no_pkinit: "{{ ipaserver_no_pkinit }}"
- dirserv_config_file: "{{ ipaserver_dirserv_config_file | default(omit) }}"
- # ssl certificate
- dirserv_cert_file: "{{ ipaserver_dirserv_cert_file | default(omit) }}"
- dirserv_pin: "{{ ipaserver_dirserv_pin | default(omit) }}"
- dirserv_cert_name: "{{ ipaserver_dirserv_cert_name | default(omit) }}"
- http_cert_file: "{{ ipaserver_http_cert_file | default(omit) }}"
- http_pin: "{{ ipaserver_http_pin | default(omit) }}"
- http_cert_name: "{{ ipaserver_http_cert_name | default(omit) }}"
- pkinit_cert_file: "{{ ipaserver_pkinit_cert_file | default(omit) }}"
- pkinit_pin: "{{ ipaserver_pkinit_pin | default(omit) }}"
- pkinit_cert_name: "{{ ipaserver_pkinit_cert_name | default(omit) }}"
- # client
- no_ntp: "{{ ipaserver_no_ntp }}"
- # certificate system
- external_ca: "{{ ipaserver_external_ca | default(omit) }}"
- external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
- subject_base: "{{ ipaserver_subject_base | default(omit) }}"
- ca_subject: "{{ ipaserver_ca_subject | default(omit) }}"
- # dns
- allow_zone_overlap: "{{ ipaserver_allow_zone_overlap }}"
- reverse_zones: "{{ ipaserver_reverse_zones | default([]) }}"
- no_reverse: "{{ ipaserver_no_reverse }}"
- auto_reverse: "{{ ipaserver_auto_reverse }}"
- zonemgr: "{{ ipaserver_zonemgr | default(omit) }}"
- forwarders: "{{ ipaserver_forwarders | default([]) }}"
- no_forwarders: "{{ ipaserver_no_forwarders }}"
- auto_forwarders: "{{ ipaserver_auto_forwarders }}"
- forward_policy: "{{ ipaserver_forward_policy | default(first) }}"
- # repair
- allow_repair: "{{ ipaserver_allow_repair }}"
- register: server_test
-
-##
-
-- block:
-
- - name: Install - Master password passthrough or creation
- no_log: yes
- master_password:
- dm_password: "{{ ipaserver_dm_password }}"
- master_password: "{{ ipaserver_master_password | default(omit) }}"
- register: master_password
-
- - name: Install - Install
- master_password:
- # basic
- dm_password: "{{ ipaserver_dm_password }}"
- password: "{{ ipaserver_password }}"
-# ip_addresses: "{{ ipaserver_ip_addresses }}"
- domain: "{{ ipaserver_domain }}"
- realm: "{{ ipaserver_realm }}"
-# hostname: "{{ ansible_fqdn }}"
- ca_cert_file: "{{ ipaserver_ca_cert_file | default(omit) }}"
- no_host_dns: "{{ ipaserver_no_host_dns }}"
- # server
-# setup_adtrust: "{{ ipaserver_setup_adtrust }}"
-# setup_kra: "{{ ipaserver_setup_kra }}"
- setup_dns: "{{ ipaserver_setup_dns }}"
- idstart: "{{ ipaserver_idstart | default(omit) }}"
- idmax: "{{ ipaserver_idmax | default(omit) }}"
- no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
- no_pkinit: "{{ ipaserver_no_pkinit }}"
- no_ui_redirect: "{{ ipaserver_no_ui_redirect }}"
- dirserv_config_file: "{{ ipaserver_dirserv_config_file | default(omit) }}"
- # ssl certificate
- dirserv_cert_file: "{{ ipaserver_dirserv_cert_file | default(omit) }}"
- dirserv_pin: "{{ ipaserver_dirserv_pin | default(omit) }}"
- dirserv_cert_name: "{{ ipaserver_dirserv_cert_name | default(omit) }}"
- http_cert_file: "{{ ipaserver_http_cert_file | default(omit) }}"
- http_pin: "{{ ipaserver_http_pin | default(omit) }}"
- http_cert_name: "{{ ipaserver_http_cert_name | default(omit) }}"
- pkinit_cert_file: "{{ ipaserver_pkinit_cert_file | default(omit) }}"
- pkinit_pin: "{{ ipaserver_pkinit_pin | default(omit) }}"
- pkinit_cert_name: "{{ ipaserver_pkinit_cert_name | default(omit) }}"
- # client
- mkhomedir: "{{ ipaserver_mkhomedir }}"
- no_ntp: "{{ ipaserver_no_ntp }}"
- ssh_trust_dns: "{{ ipaserver_ssh_trust_dns }}"
- no_ssh: "{{ ipaserver_no_ssh }}"
- no_sshd: "{{ ipaserver_no_sshd }}"
- no_dns_sshfp: "{{ ipaserver_no_dns_sshfp }}"
- # certificate system
- external_ca: "{{ ipaserver_external_ca | default(omit) }}"
- external_ca_type: "{{ ipaserver_external_ca_type | default(generic) }}"
- external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
- subject_base: "{{ ipaserver_subject_base | default(omit) }}"
- ca_subject: "{{ ipaserver_ca_subject | default(omit) }}"
- ca_signing_algorithm: "{{ ipaserver_ca_signing_algorithm | default(omit) }}"
- # dns
- allow_zone_overlap: "{{ ipaserver_allow_zone_overlap }}"
- reverse_zone: "{{ ipaserver_reverse_zone | default(omit) }}"
- no_reverse: "{{ ipaserver_no_reverse }}"
- auto_reverse: "{{ ipaserver_auto_reverse }}"
- zonemgr: "{{ ipaserver_zonemgr | default(omit) }}"
- forwarders: "{{ ipaserver_forwarders | default([]) }}"
- no_forwarders: "{{ ipaserver_no_forwarders }}"
- auto_forwarders: "{{ ipaserver_auto_forwarders }}"
- forward_policy: "{{ ipaserver_forward_policy | default(first) }}"
- no_dnssec_validation: "{{ ipaserver_no_dnssec_validation }}"
- # ad trust
- #enable_compat: "{{ ipaserver_enable_compat }}"
- #netbios_name: "{{ ipaserver_netbios_name | default(omit) }}"
- #rid_base: "{{ ipaserver_rid_base | default(omit) }}"
- #secondary_rid_base: "{{ ipaserver_secondary_rid_base | default(omit) }}"
-
-
-
-
-# - name: Install - Create directory server instance
-# create_ds:
-
-
- - fail:
-
- - name: Install - Install server
- ipaserver:
- # basic
- dm_password: "{{ ipaserver_dm_password }}"
- password: "{{ ipaserver_password }}"
-# ip_addresses: "{{ ipaserver_ip_addresses }}"
- domain: "{{ ipaserver_domain }}"
- realm: "{{ ipaserver_realm }}"
-# hostname: "{{ ansible_fqdn }}"
- ca_cert_file: "{{ ipaserver_ca_cert_file | default(omit) }}"
- no_host_dns: "{{ ipaserver_no_host_dns }}"
- # server
-# setup_adtrust: "{{ ipaserver_setup_adtrust }}"
-# setup_kra: "{{ ipaserver_setup_kra }}"
- setup_dns: "{{ ipaserver_setup_dns }}"
- idstart: "{{ ipaserver_idstart | default(omit) }}"
- idmax: "{{ ipaserver_idmax | default(omit) }}"
- no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
- no_pkinit: "{{ ipaserver_no_pkinit }}"
- no_ui_redirect: "{{ ipaserver_no_ui_redirect }}"
- dirserv_config_file: "{{ ipaserver_dirserv_config_file | default(omit) }}"
- # ssl certificate
- dirserv_cert_file: "{{ ipaserver_dirserv_cert_file | default(omit) }}"
- dirserv_pin: "{{ ipaserver_dirserv_pin | default(omit) }}"
- dirserv_cert_name: "{{ ipaserver_dirserv_cert_name | default(omit) }}"
- http_cert_file: "{{ ipaserver_http_cert_file | default(omit) }}"
- http_pin: "{{ ipaserver_http_pin | default(omit) }}"
- http_cert_name: "{{ ipaserver_http_cert_name | default(omit) }}"
- pkinit_cert_file: "{{ ipaserver_pkinit_cert_file | default(omit) }}"
- pkinit_pin: "{{ ipaserver_pkinit_pin | default(omit) }}"
- pkinit_cert_name: "{{ ipaserver_pkinit_cert_name | default(omit) }}"
- # client
- mkhomedir: "{{ ipaserver_mkhomedir }}"
- no_ntp: "{{ ipaserver_no_ntp }}"
- ssh_trust_dns: "{{ ipaserver_ssh_trust_dns }}"
- no_ssh: "{{ ipaserver_no_ssh }}"
- no_sshd: "{{ ipaserver_no_sshd }}"
- no_dns_sshfp: "{{ ipaserver_no_dns_sshfp }}"
- # certificate system
- external_ca: "{{ ipaserver_external_ca | default(omit) }}"
- external_ca_type: "{{ ipaserver_external_ca_type | default(generic) }}"
- external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
- subject_base: "{{ ipaserver_subject_base | default(omit) }}"
- ca_subject: "{{ ipaserver_ca_subject | default(omit) }}"
- ca_signing_algorithm: "{{ ipaserver_ca_signing_algorithm | default(omit) }}"
- # dns
- allow_zone_overlap: "{{ ipaserver_allow_zone_overlap }}"
- reverse_zone: "{{ ipaserver_reverse_zone | default(omit) }}"
- no_reverse: "{{ ipaserver_no_reverse }}"
- auto_reverse: "{{ ipaserver_auto_reverse }}"
- zonemgr: "{{ ipaserver_zonemgr | default(omit) }}"
- forwarders: "{{ ipaserver_forwarders | default([]) }}"
- no_forwarders: "{{ ipaserver_no_forwarders }}"
- auto_forwarders: "{{ ipaserver_auto_forwarders }}"
- forward_policy: "{{ ipaserver_forward_policy | default(first) }}"
- no_dnssec_validation: "{{ ipaserver_no_dnssec_validation }}"
- # ad trust
- #enable_compat: "{{ ipaserver_enable_compat }}"
- #netbios_name: "{{ ipaserver_netbios_name | default(omit) }}"
- #rid_base: "{{ ipaserver_rid_base | default(omit) }}"
- #secondary_rid_base: "{{ ipaserver_secondary_rid_base | default(omit) }}"
-
- state: present
-
-
-
-
- - name: Install - Cleanup root IPA cache
- file:
- path: "/root/.ipa_cache"
- state: absent
diff --git a/roles/ipaserver/tasks/install-test.yml b/roles/ipaserver/tasks/install-test.yml
deleted file mode 100644
index 3d338ed12500b616cc471ef135cdbfaf27c4b427..0000000000000000000000000000000000000000
--- a/roles/ipaserver/tasks/install-test.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# tasks file for ipaserver
-
-- name: Install - Install IPA server package
- package:
- name: "{{ item }}"
- state: present
- with_items: "{{ ipaserver_packages }}"
-
-- name: Install - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
-
-- name: Install - Server installation
- server_install:
- dm_password: "{{ ipaserver_dm_password }}"
- password: "{{ ipaserver_password }}"
- domain: "{{ ipaserver_domain | default(omit)}}"
- realm: "{{ ipaserver_realm | default(omit)}}"
- hostname: "{{ ipaserver_hostname | default(ansible_fqdn) }}"
- setup_dns: "{{ ipaserver_setup_dns }}"
- no_reverse: "{{ ipaserver_no_reverse }}"
- auto_forwarders: "{{ ipaserver_auto_forwarders }}"
- register: server_install
-
-##
-
-- name: Install - Cleanup root IPA cache
- file:
- path: "/root/.ipa_cache"
- state: absent
diff --git a/roles/ipaserver/tasks/uninstall.yml.old b/roles/ipaserver/tasks/uninstall.yml.old
deleted file mode 100644
index d9c31a8bac21ad4524094067a5695d07e8b4f07c..0000000000000000000000000000000000000000
--- a/roles/ipaserver/tasks/uninstall.yml.old
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# tasks to uninstall IPA server
-
-- name: Uninstall - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
-
-- name: Uninstall - Uninstall IPA server
- command: /usr/sbin/ipa-server-install --uninstall -U {% if ipaserver_ignore_topology_disconnect | bool %}--ignore-topology-disconnect{% endif %} {% if ipaserver_ignore_last_of_role | bool %}--ignore-last-of-role{% endif %}
- register: uninstall
- # 2 means that uninstall failed because IPA server was not configured
- failed_when: uninstall.rc != 0 and uninstall.rc != 2
- changed_when: uninstall.rc == 0
-
-#- name: Remove IPA server packages
-# package:
-# name: "{{ item }}"
-# state: absent
-# with_items: "{{ ipaserver_packages }}"