From 66936d1afa1b57b47f4063b32bd9d57faf0df0b2 Mon Sep 17 00:00:00 2001
From: Samuel Veloso <veloso.lopez.samuel@gmail.com>
Date: Tue, 9 Jun 2020 14:33:03 +0200
Subject: [PATCH] Test ipaserver installation without CA
---
tests/ca-less/install_server_without_ca.yml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/tests/ca-less/install_server_without_ca.yml b/tests/ca-less/install_server_without_ca.yml
index d076f4b2..ecb609c4 100644
--- a/tests/ca-less/install_server_without_ca.yml
+++ b/tests/ca-less/install_server_without_ca.yml
@@ -7,11 +7,7 @@
- name: Run generate-certificates.sh
command: >
/bin/bash
-<<<<<<< HEAD
generate-certificates.sh create
-=======
- generate-certificates.sh
->>>>>>> t-woerner/server_ca_less
"{{ groups.ipaserver[0] }}"
"{{ ipaserver_domain | default(groups.ipaserver[0].split('.')[1:] | join ('.')) }}"
args:
@@ -63,11 +59,7 @@
- name: Copy p12 certificates
copy:
-<<<<<<< HEAD
src: "{{ playbook_dir }}/certificates/{{ item }}/{{ groups.ipaserver[0] }}/cert.p12"
-=======
- src: "{{ playbook_dir }}/certificates/{{ item }}/ipaserver/cert.p12"
->>>>>>> t-woerner/server_ca_less
dest: "/root/ca-less-test/{{ item }}.p12"
owner: root
group: root
--
GitLab