Browse Source

Merge pull request #3600 from tbielawa/etcd_is_atomic-BZ1427067

Merged by openshift-bot
OpenShift Bot 8 years ago
parent
commit
f36f78c637

+ 1 - 1
playbooks/common/openshift-cluster/redeploy-certificates/ca.yml

@@ -31,7 +31,7 @@
 - name: Generate new etcd CA
   hosts: oo_first_etcd
   roles:
-  - role: etcd_ca
+  - role: openshift_etcd_ca
     etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}"
     etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
     etcd_certificates_etcd_hosts: "{{ groups.oo_etcd_to_config | default([], true) }}"

+ 1 - 1
roles/etcd_server_certificates/meta/main.yml

@@ -13,4 +13,4 @@ galaxy_info:
   - cloud
   - system
 dependencies:
-- role: etcd_ca
+- role: openshift_etcd_ca

+ 17 - 0
roles/openshift_etcd_ca/meta/main.yml

@@ -0,0 +1,17 @@
+---
+galaxy_info:
+  author: Tim Bielawa
+  description: Meta role around the etcd_ca role
+  company: Red Hat, Inc.
+  license: Apache License, Version 2.0
+  min_ansible_version: 2.2
+  platforms:
+  - name: EL
+    versions:
+    - 7
+  categories:
+  - cloud
+  - system
+dependencies:
+- role: openshift_etcd_facts
+- role: etcd_ca

+ 1 - 0
roles/openshift_etcd_ca/tasks/main.yml

@@ -0,0 +1 @@
+---