summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-09 19:15:33 -0500
committerGitHub <noreply@github.com>2017-03-09 19:15:33 -0500
commitf36f78c63762f1764f25e135e576ca619a9ba7d3 (patch)
treefa696547d9ffc4b4b83f9fad2393d5891184c944 /roles
parent28127183106236c332e15d81fce3c6d76768a619 (diff)
parent56b37d8b059fe20a657347a12dad4f2b7aa67553 (diff)
downloadopenshift-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
Diffstat (limited to 'roles')
-rw-r--r--roles/etcd_server_certificates/meta/main.yml2
-rw-r--r--roles/openshift_etcd_ca/meta/main.yml17
-rw-r--r--roles/openshift_etcd_ca/tasks/main.yml1
3 files changed, 19 insertions, 1 deletions
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 @@
+---