Merge "Modify IPA install and usage for multi-env"

playbooks/baremetal-full-freeipa.yml

@@ -96,6 +96,13 @@
             name: NetworkManager
             state: reloaded
 
+        - name: disable unbound service
+          become: true
+          service:
+            name: unbound
+            state: stopped
+          ignore_errors: true
+
     - name: remove any existing entries from the resolv.conf file
       become: true
       lineinfile:

roles/freeipa-setup/templates/deploy_freeipa.sh.j2

@@ -71,7 +71,9 @@ ipa-server-install -U \
 {% else %}
     --auto-forwarders \
 {% endif %}
+{% if cloudenv is not defined or cloudenv not in ['internal'] -%}
     --auto-reverse {{ ipa_server_install_params|default('') }}
+{% endif %}
 ## * Set CA to create CRL on restart
 sed -i "s/ca.crl.MasterCRL.publishOnStart=.*/ca.crl.MasterCRL.publishOnStart=true/" /etc/pki/pki-tomcat/ca/CS.cfg
 systemctl restart pki-tomcatd@pki-tomcat.service