From 4039ef6d65be338733ea982173a34f7f6c797903 Mon Sep 17 00:00:00 2001 From: Sundaresan Rajangam Date: Mon, 17 Apr 2017 23:08:54 -0700 Subject: [PATCH] Copy ssl certs under ssl/certs and private key under ssl/private With Puppet provisionig, SSL certificates are copied at /etc/contrail/ssl/certs/ and private key is copied at /etc/contrail/ssl/private/. Hence retaining the same behavior with ansible provisioning. Change-Id: I58d7301d10249f469a4abc6220669dbc567b673b Closes-Bug: #1681892 --- .../roles/contrail/common/tasks/copy_ssl_certs.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/playbooks/roles/contrail/common/tasks/copy_ssl_certs.yml b/playbooks/roles/contrail/common/tasks/copy_ssl_certs.yml index 6d9e61c3..8cb1da5c 100644 --- a/playbooks/roles/contrail/common/tasks/copy_ssl_certs.yml +++ b/playbooks/roles/contrail/common/tasks/copy_ssl_certs.yml @@ -5,14 +5,15 @@ stat: path={{ ssl_certs_src_dir }} register: check_ssl_certs_src_dir -- name: Create SSL Cert dir on container - file: path={{ ssl_certs_dir }} state=directory +- name: Create SSL directories on container + file: path={{ ssl_certs_dir }}/{{ item }} state=directory + with_items: ["certs", "private"] when: check_ssl_certs_src_dir.stat.exists - name: Copy SSL files for use by container copy: src={{ item.src }} dest={{ item.dest }} with_items: - - { src: "{{ ssl_certs_src_dir }}/ca-cert.pem", dest: "{{ ssl_certs_dir }}/ca-cert.pem" } - - { src: "{{ ssl_certs_src_dir }}/server.pem", dest: "{{ ssl_certs_dir }}/server.pem" } - - { src: "{{ ssl_certs_src_dir }}/server-privkey.pem", dest: "{{ ssl_certs_dir }}/server-privkey.pem" } + - { src: "{{ ssl_certs_src_dir }}/ca-cert.pem", dest: "{{ ssl_certs_dir }}/certs/ca-cert.pem" } + - { src: "{{ ssl_certs_src_dir }}/server.pem", dest: "{{ ssl_certs_dir }}/certs/server.pem" } + - { src: "{{ ssl_certs_src_dir }}/server-privkey.pem", dest: "{{ ssl_certs_dir }}/private/server-privkey.pem" } when: check_ssl_certs_src_dir.stat.exists