Merge "Fix deprecation warning for undefined variables"

This commit is contained in:
Jenkins 2016-07-23 16:22:49 +00:00 committed by Gerrit Code Review
commit 55d39d07cf

View File

@ -13,19 +13,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Drop user provided ssl cert and key
- name: Deploy user provided ssl cert
copy:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
src: "{{ haproxy_user_ssl_cert }}"
dest: "{{ haproxy_ssl_cert }}"
owner: "root"
group: "root"
mode: "{{ item.mode }}"
with_items:
- { src: "{{ haproxy_user_ssl_cert }}", dest: "{{ haproxy_ssl_cert }}", mode: "0644" }
- { src: "{{ haproxy_user_ssl_key }}", dest: "{{ haproxy_ssl_key }}", mode: "0640" }
when:
- haproxy_user_ssl_cert is defined
- haproxy_user_ssl_key is defined
mode: "0644"
when: haproxy_user_ssl_cert is defined
notify:
- regen pem
tags:
- haproxy-ssl
- name: Deploy user provided ssl key
copy:
src: "{{ haproxy_user_ssl_key }}"
dest: "{{ haproxy_ssl_key }}"
owner: "root"
group: "root"
mode: "0600"
when: haproxy_user_ssl_key is defined
notify:
- regen pem
tags: