diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-09 19:15:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-09 19:15:33 -0500 |
| commit | f36f78c63762f1764f25e135e576ca619a9ba7d3 (patch) | |
| tree | fa696547d9ffc4b4b83f9fad2393d5891184c944 | |
| parent | 28127183106236c332e15d81fce3c6d76768a619 (diff) | |
| parent | 56b37d8b059fe20a657347a12dad4f2b7aa67553 (diff) | |
| download | openshift-f36f78c63762f1764f25e135e576ca619a9ba7d3.tar.gz openshift-f36f78c63762f1764f25e135e576ca619a9ba7d3.tar.bz2 openshift-f36f78c63762f1764f25e135e576ca619a9ba7d3.tar.xz openshift-f36f78c63762f1764f25e135e576ca619a9ba7d3.zip | |
Merge pull request #3600 from tbielawa/etcd_is_atomic-BZ1427067
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/ca.yml | 2 | ||||
| -rw-r--r-- | roles/etcd_server_certificates/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_etcd_ca/meta/main.yml | 17 | ||||
| -rw-r--r-- | roles/openshift_etcd_ca/tasks/main.yml | 1 |
4 files changed, 20 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml index 2af699209..cbb4a2434 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml +++ b/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) }}" diff --git a/roles/etcd_server_certificates/meta/main.yml b/roles/etcd_server_certificates/meta/main.yml index b453f2bd8..98c913dba 100644 --- a/roles/etcd_server_certificates/meta/main.yml +++ b/roles/etcd_server_certificates/meta/main.yml @@ -13,4 +13,4 @@ galaxy_info: - cloud - system dependencies: -- role: etcd_ca +- role: openshift_etcd_ca diff --git a/roles/openshift_etcd_ca/meta/main.yml b/roles/openshift_etcd_ca/meta/main.yml new file mode 100644 index 000000000..d73d27356 --- /dev/null +++ b/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 diff --git a/roles/openshift_etcd_ca/tasks/main.yml b/roles/openshift_etcd_ca/tasks/main.yml new file mode 100644 index 000000000..ed97d539c --- /dev/null +++ b/roles/openshift_etcd_ca/tasks/main.yml @@ -0,0 +1 @@ +--- |