[IPA] Use ipa_server variable where posible
Don't use hardcoded ipa01, use ipa_server variable instead that is set in group_vars. Signed-off-by: Michal Konecny <mkonecny@redhat.com>
This commit is contained in:
parent
3858d5841d
commit
df9d9a0d51
4 changed files with 8 additions and 8 deletions
|
@ -16,7 +16,7 @@
|
||||||
[realms]
|
[realms]
|
||||||
{{ ipa_realm }} = {
|
{{ ipa_realm }} = {
|
||||||
{% if ansible_distribution_major_version|default(0)|int == 6 and ansible_distribution == "RedHat" %}
|
{% if ansible_distribution_major_version|default(0)|int == 6 and ansible_distribution == "RedHat" %}
|
||||||
kdc = ipa01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org
|
kdc = {{ ipa_server }}
|
||||||
{% else %}
|
{% else %}
|
||||||
kdc = https://id{{ env_suffix }}.fedoraproject.org/KdcProxy
|
kdc = https://id{{ env_suffix }}.fedoraproject.org/KdcProxy
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -127,7 +127,7 @@
|
||||||
- name: configure replication
|
- name: configure replication
|
||||||
block:
|
block:
|
||||||
- name: create replica file
|
- name: create replica file
|
||||||
delegate_to: ipa01{{ env_suffix }}.iad2.fedoraproject.org
|
delegate_to: {{ ipa_server }}
|
||||||
command: ipa-replica-prepare
|
command: ipa-replica-prepare
|
||||||
--password={{ipa_dm_password}}
|
--password={{ipa_dm_password}}
|
||||||
{{inventory_hostname}}
|
{{inventory_hostname}}
|
||||||
|
@ -135,7 +135,7 @@
|
||||||
when: ansible_distribution_major_version|int < 8
|
when: ansible_distribution_major_version|int < 8
|
||||||
|
|
||||||
- name: retrieve replica file
|
- name: retrieve replica file
|
||||||
delegate_to: ipa01{{ env_suffix }}.iad2.fedoraproject.org
|
delegate_to: {{ ipa_server }}
|
||||||
fetch: src=/var/lib/ipa/replica-info-{{inventory_hostname}}.gpg
|
fetch: src=/var/lib/ipa/replica-info-{{inventory_hostname}}.gpg
|
||||||
dest=/tmp/ipa_replica_{{inventory_hostname}}.gpg
|
dest=/tmp/ipa_replica_{{inventory_hostname}}.gpg
|
||||||
flat=yes
|
flat=yes
|
||||||
|
@ -197,7 +197,7 @@
|
||||||
--force-join
|
--force-join
|
||||||
--log-file=/var/log/ipainstall.log
|
--log-file=/var/log/ipainstall.log
|
||||||
--domain={{ipa_realm}}
|
--domain={{ipa_realm}}
|
||||||
--server=ipa02{{ env_suffix }}.iad2.fedoraproject.org
|
--server={{ ipa_server }}
|
||||||
--dirsrv-config-file=/root/ldif/replica-install.ldif
|
--dirsrv-config-file=/root/ldif/replica-install.ldif
|
||||||
when: ansible_distribution_major_version|int >= 8
|
when: ansible_distribution_major_version|int >= 8
|
||||||
when: not ipa_initial and replication_status.rc > 0
|
when: not ipa_initial and replication_status.rc > 0
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
ipa_pass: "{{ipa_admin_password}}"
|
ipa_pass: "{{ipa_admin_password}}"
|
||||||
validate_certs: no
|
validate_certs: no
|
||||||
run_once: yes
|
run_once: yes
|
||||||
delegate_to: "ipa01{{ env_suffix }}.iad2.fedoraproject.org"
|
delegate_to: "{{ ipa_server }}"
|
||||||
tags:
|
tags:
|
||||||
- ipa/server
|
- ipa/server
|
||||||
- config
|
- config
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
mode: 0755
|
mode: 0755
|
||||||
# Only run the cron job on one server
|
# Only run the cron job on one server
|
||||||
run_once: yes
|
run_once: yes
|
||||||
delegate_to: "ipa01{{ env_suffix }}.iad2.fedoraproject.org"
|
delegate_to: "{{ ipa_server }}"
|
||||||
tags:
|
tags:
|
||||||
- ipa/server
|
- ipa/server
|
||||||
- config
|
- config
|
||||||
|
@ -109,4 +109,4 @@
|
||||||
- collectd
|
- collectd
|
||||||
# Only collect stats on one server
|
# Only collect stats on one server
|
||||||
run_once: yes
|
run_once: yes
|
||||||
delegate_to: "ipa01{{ env_suffix }}.iad2.fedoraproject.org"
|
delegate_to: "{{ ipa_server }}"
|
||||||
|
|
|
@ -59,7 +59,7 @@ def parse_args():
|
||||||
parser = argparse.ArgumentParser(description="Check for sysadmin users with no otp token set, admin credentials are required to run script")
|
parser = argparse.ArgumentParser(description="Check for sysadmin users with no otp token set, admin credentials are required to run script")
|
||||||
parser.add_argument("-u", "--username", default="admin", help="ipa user to use")
|
parser.add_argument("-u", "--username", default="admin", help="ipa user to use")
|
||||||
parser.add_argument("-c", "--cert-path", default="/etc/ipa/ca.crt", help="location of ipa cert")
|
parser.add_argument("-c", "--cert-path", default="/etc/ipa/ca.crt", help="location of ipa cert")
|
||||||
parser.add_argument("-s", "--server-address", default="ipa01{{ env_suffix }}.iad2.fedoraproject.org", help="server to run against")
|
parser.add_argument("-s", "--server-address", default="{{ ipa_server }}", help="server to run against")
|
||||||
parser.add_argument("-p", "--password", help="ipa user password", required=True)
|
parser.add_argument("-p", "--password", help="ipa user password", required=True)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue