diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-16 08:49:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 08:49:07 -0500 |
| commit | 7dcc6292e2ca89fe22675491299cf5853860bed8 (patch) | |
| tree | 956a8f8d2cac46f5529604c2201facea1611ea0d /playbooks/byo/openshift-etcd | |
| parent | 45532f4578f99243f14493aa42b4ffd7b0fb8265 (diff) | |
| parent | e5f4823d6e4191367178f743ddd5e0885598e8cf (diff) | |
| download | openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.gz openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.bz2 openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.tar.xz openshift-7dcc6292e2ca89fe22675491299cf5853860bed8.zip | |
Merge pull request #6064 from mtnbikenc/consolidate-init
Playbook Consolidation - Initialization
Diffstat (limited to 'playbooks/byo/openshift-etcd')
| -rw-r--r-- | playbooks/byo/openshift-etcd/certificates.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-etcd/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-etcd/embedded2external.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-etcd/migrate.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-etcd/restart.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-etcd/scaleup.yml | 4 |
6 files changed, 6 insertions, 18 deletions
diff --git a/playbooks/byo/openshift-etcd/certificates.yml b/playbooks/byo/openshift-etcd/certificates.yml index e35cf243f..0e9d42cd6 100644 --- a/playbooks/byo/openshift-etcd/certificates.yml +++ b/playbooks/byo/openshift-etcd/certificates.yml @@ -1,7 +1,5 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-etcd/ca.yml diff --git a/playbooks/byo/openshift-etcd/config.yml b/playbooks/byo/openshift-etcd/config.yml index 1342bd60c..c6e0a9d90 100644 --- a/playbooks/byo/openshift-etcd/config.yml +++ b/playbooks/byo/openshift-etcd/config.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-etcd/config.yml diff --git a/playbooks/byo/openshift-etcd/embedded2external.yml b/playbooks/byo/openshift-etcd/embedded2external.yml index 6690a7624..492f677b0 100644 --- a/playbooks/byo/openshift-etcd/embedded2external.yml +++ b/playbooks/byo/openshift-etcd/embedded2external.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-etcd/embedded2external.yml diff --git a/playbooks/byo/openshift-etcd/migrate.yml b/playbooks/byo/openshift-etcd/migrate.yml index 2dec2bef6..3020e7db4 100644 --- a/playbooks/byo/openshift-etcd/migrate.yml +++ b/playbooks/byo/openshift-etcd/migrate.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-etcd/migrate.yml diff --git a/playbooks/byo/openshift-etcd/restart.yml b/playbooks/byo/openshift-etcd/restart.yml index 034bba4b4..0889d91ba 100644 --- a/playbooks/byo/openshift-etcd/restart.yml +++ b/playbooks/byo/openshift-etcd/restart.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-etcd/restart.yml diff --git a/playbooks/byo/openshift-etcd/scaleup.yml b/playbooks/byo/openshift-etcd/scaleup.yml index a2a5856a9..e7d62e264 100644 --- a/playbooks/byo/openshift-etcd/scaleup.yml +++ b/playbooks/byo/openshift-etcd/scaleup.yml @@ -1,6 +1,4 @@ --- -- include: ../openshift-cluster/initialize_groups.yml - -- include: ../../common/openshift-cluster/std_include.yml +- include: ../../init/main.yml - include: ../../common/openshift-etcd/scaleup.yml |