From f1f466dda5365bd365259dc47db258d7926c63f6 Mon Sep 17 00:00:00 2001
From: Tim Bielawa <tbielawa@redhat.com>
Date: Mon, 6 Mar 2017 10:48:57 -0800
Subject: New role
---
.../openshift-cluster/redeploy-certificates/ca.yml | 2 +-
roles/etcd_server_certificates/meta/main.yml | 2 +-
roles/openshift_etcd_ca/meta/main.yml | 17 +++++++++++++++++
roles/openshift_etcd_ca/tasks/main.yml | 4 ++++
4 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 roles/openshift_etcd_ca/meta/main.yml
create mode 100644 roles/openshift_etcd_ca/tasks/main.yml
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..dfa055643
--- /dev/null
+++ b/roles/openshift_etcd_ca/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+- name: Ensure openshift_etcd_ca role is called
+ debug:
+ msg: openshift_etcd_ca role was called
--
cgit v1.2.3
From 56b37d8b059fe20a657347a12dad4f2b7aa67553 Mon Sep 17 00:00:00 2001
From: Tim Bielawa <tbielawa@redhat.com>
Date: Thu, 9 Mar 2017 10:25:53 -0800
Subject: Remove debug task
---
roles/openshift_etcd_ca/tasks/main.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/roles/openshift_etcd_ca/tasks/main.yml b/roles/openshift_etcd_ca/tasks/main.yml
index dfa055643..ed97d539c 100644
--- a/roles/openshift_etcd_ca/tasks/main.yml
+++ b/roles/openshift_etcd_ca/tasks/main.yml
@@ -1,4 +1 @@
---
-- name: Ensure openshift_etcd_ca role is called
- debug:
- msg: openshift_etcd_ca role was called
--
cgit v1.2.3