浏览代码

Do not delete IAM cert if explicitely requested

Given the number of server certificates uploaded to AWS is limited (40 at the moment),
intensive testing can exhaust all available slots. Thus, it should be allowed
to reuse the certificates among deployments. Thus, allowing the skip the deletion.
Jan Chaloupka 6 年之前
父节点
当前提交
6ff8220d38
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      roles/openshift_aws/defaults/main.yml
  2. 1 1
      roles/openshift_aws/tasks/uninstall_iam_cert.yml

+ 1 - 0
roles/openshift_aws/defaults/main.yml

@@ -1,6 +1,7 @@
 ---
 openshift_aws_create_s3: True
 openshift_aws_create_iam_cert: True
+openshift_aws_delete_iam_cert: "{{ openshift_aws_create_iam_cert }}"
 openshift_aws_create_iam_role: False
 openshift_aws_create_security_groups: True
 openshift_aws_create_launch_config: True

+ 1 - 1
roles/openshift_aws/tasks/uninstall_iam_cert.yml

@@ -1,6 +1,6 @@
 ---
 - when:
-  - openshift_aws_create_iam_cert | bool
+  - openshift_aws_delete_iam_cert | bool
   - openshift_aws_iam_cert_path != ''
   - openshift_aws_iam_cert_key_path != ''
   - openshift_aws_elb_cert_arn == ''