diff options
| author | Russell Teague <rteague@redhat.com> | 2017-09-03 22:59:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 22:59:02 -0400 |
| commit | 2687979a5dd8df82b6843937e2bcc6a76b6b1668 (patch) | |
| tree | 6aaeec8abe005baf374305e7e2b2bb615703c3db /playbooks/byo | |
| parent | 20cf3396e4aae5aef6485a23e6cc3134c7a2d1be (diff) | |
| parent | 679683df12afa2f07d83d16d58462d9077130776 (diff) | |
| download | openshift-2687979a5dd8df82b6843937e2bcc6a76b6b1668.tar.gz openshift-2687979a5dd8df82b6843937e2bcc6a76b6b1668.tar.bz2 openshift-2687979a5dd8df82b6843937e2bcc6a76b6b1668.tar.xz openshift-2687979a5dd8df82b6843937e2bcc6a76b6b1668.zip | |
Merge pull request #5288 from mtnbikenc/etcd-entry-standardization
Standardize etcd entry point playbooks
Diffstat (limited to 'playbooks/byo')
| -rw-r--r-- | playbooks/byo/openshift-etcd/config.yml | 8 | ||||
| -rw-r--r-- | playbooks/byo/openshift-etcd/migrate.yml | 6 | ||||
| -rw-r--r-- | playbooks/byo/openshift-etcd/restart.yml | 4 | ||||
| -rw-r--r-- | playbooks/byo/openshift-etcd/scaleup.yml | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/playbooks/byo/openshift-etcd/config.yml b/playbooks/byo/openshift-etcd/config.yml index dd3f47a4d..1342bd60c 100644 --- a/playbooks/byo/openshift-etcd/config.yml +++ b/playbooks/byo/openshift-etcd/config.yml @@ -1,14 +1,6 @@ --- - include: ../openshift-cluster/initialize_groups.yml - tags: - - always - include: ../../common/openshift-cluster/std_include.yml - tags: - - always - include: ../../common/openshift-etcd/config.yml - vars: - openshift_cluster_id: "{{ cluster_id | default('default') }}" - openshift_debug_level: "{{ debug_level | default(2) }}" - openshift_deployment_subtype: "{{ deployment_subtype | default(none) }}" diff --git a/playbooks/byo/openshift-etcd/migrate.yml b/playbooks/byo/openshift-etcd/migrate.yml index 143016159..2dec2bef6 100644 --- a/playbooks/byo/openshift-etcd/migrate.yml +++ b/playbooks/byo/openshift-etcd/migrate.yml @@ -1,8 +1,6 @@ --- - include: ../openshift-cluster/initialize_groups.yml - tags: - - always + +- include: ../../common/openshift-cluster/std_include.yml - include: ../../common/openshift-etcd/migrate.yml - tags: - - always diff --git a/playbooks/byo/openshift-etcd/restart.yml b/playbooks/byo/openshift-etcd/restart.yml index d43533641..034bba4b4 100644 --- a/playbooks/byo/openshift-etcd/restart.yml +++ b/playbooks/byo/openshift-etcd/restart.yml @@ -1,10 +1,6 @@ --- - include: ../openshift-cluster/initialize_groups.yml - tags: - - always - include: ../../common/openshift-cluster/std_include.yml - tags: - - always - include: ../../common/openshift-etcd/restart.yml diff --git a/playbooks/byo/openshift-etcd/scaleup.yml b/playbooks/byo/openshift-etcd/scaleup.yml index c35fd9f37..a2a5856a9 100644 --- a/playbooks/byo/openshift-etcd/scaleup.yml +++ b/playbooks/byo/openshift-etcd/scaleup.yml @@ -1,8 +1,6 @@ --- - include: ../openshift-cluster/initialize_groups.yml -- include: ../../common/openshift-cluster/evaluate_groups.yml +- include: ../../common/openshift-cluster/std_include.yml + - include: ../../common/openshift-etcd/scaleup.yml - vars: - openshift_cluster_id: "{{ cluster_id | default('default') }}" - openshift_deployment_type: "{{ deployment_type }}" |