summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-node
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-11-22 16:34:59 -0500
committerGitHub <noreply@github.com>2017-11-22 16:34:59 -0500
commit9a405010c5a656f89866906d29866ba98493e91b (patch)
treeb9bcd798419a79a5517d9b1f6909f88f98179e7c /playbooks/openshift-node
parentdbaf0dcd3c0b68da7e38ee098d9e6f8a4ed9e532 (diff)
parentbf19d26f2be591b9cb4e3379c015bfe5f31b4f0a (diff)
downloadopenshift-9a405010c5a656f89866906d29866ba98493e91b.tar.gz
openshift-9a405010c5a656f89866906d29866ba98493e91b.tar.bz2
openshift-9a405010c5a656f89866906d29866ba98493e91b.tar.xz
openshift-9a405010c5a656f89866906d29866ba98493e91b.zip
Merge pull request #6234 from mtnbikenc/include-deprecation-openshift-node
Include Deprecation - openshift-node
Diffstat (limited to 'playbooks/openshift-node')
-rw-r--r--playbooks/openshift-node/certificates.yml4
-rw-r--r--playbooks/openshift-node/config.yml4
-rw-r--r--playbooks/openshift-node/network_manager.yml4
-rw-r--r--playbooks/openshift-node/private/additional_config.yml2
-rw-r--r--playbooks/openshift-node/private/config.yml14
-rw-r--r--playbooks/openshift-node/private/image_prep.yml14
-rw-r--r--playbooks/openshift-node/private/network_manager.yml2
-rw-r--r--playbooks/openshift-node/restart.yml4
-rw-r--r--playbooks/openshift-node/scaleup.yml6
9 files changed, 27 insertions, 27 deletions
diff --git a/playbooks/openshift-node/certificates.yml b/playbooks/openshift-node/certificates.yml
index 0384877d9..7ae87c09a 100644
--- a/playbooks/openshift-node/certificates.yml
+++ b/playbooks/openshift-node/certificates.yml
@@ -1,4 +1,4 @@
---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
-- include: private/certificates.yml
+- import_playbook: private/certificates.yml
diff --git a/playbooks/openshift-node/config.yml b/playbooks/openshift-node/config.yml
index 8ee57ce8d..c7814207c 100644
--- a/playbooks/openshift-node/config.yml
+++ b/playbooks/openshift-node/config.yml
@@ -1,4 +1,4 @@
---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
-- include: private/config.yml
+- import_playbook: private/config.yml
diff --git a/playbooks/openshift-node/network_manager.yml b/playbooks/openshift-node/network_manager.yml
index c0900308c..88a93952d 100644
--- a/playbooks/openshift-node/network_manager.yml
+++ b/playbooks/openshift-node/network_manager.yml
@@ -1,4 +1,4 @@
---
-- include: ../init/evaluate_groups.yml
+- import_playbook: ../init/evaluate_groups.yml
-- include: private/network_manager.yml
+- import_playbook: private/network_manager.yml
diff --git a/playbooks/openshift-node/private/additional_config.yml b/playbooks/openshift-node/private/additional_config.yml
index ac757397b..261e2048f 100644
--- a/playbooks/openshift-node/private/additional_config.yml
+++ b/playbooks/openshift-node/private/additional_config.yml
@@ -24,7 +24,7 @@
key: oo_nodes_use_{{ (openshift_use_kuryr | default(False)) | ternary('kuryr','nothing') }}
changed_when: False
-- include: etcd_client_config.yml
+- import_playbook: etcd_client_config.yml
vars:
openshift_node_scale_up_group: "oo_nodes_use_flannel:oo_nodes_use_calico:oo_nodes_use_contiv:oo_nodes_use_kuryr"
diff --git a/playbooks/openshift-node/private/config.yml b/playbooks/openshift-node/private/config.yml
index 28e3c1b1b..300a90371 100644
--- a/playbooks/openshift-node/private/config.yml
+++ b/playbooks/openshift-node/private/config.yml
@@ -11,19 +11,19 @@
status: "In Progress"
start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-- include: certificates.yml
+- import_playbook: certificates.yml
-- include: setup.yml
+- import_playbook: setup.yml
-- include: containerized_nodes.yml
+- import_playbook: containerized_nodes.yml
-- include: configure_nodes.yml
+- import_playbook: configure_nodes.yml
-- include: additional_config.yml
+- import_playbook: additional_config.yml
-- include: manage_node.yml
+- import_playbook: manage_node.yml
-- include: enable_excluders.yml
+- import_playbook: enable_excluders.yml
- name: Node Install Checkpoint End
hosts: all
diff --git a/playbooks/openshift-node/private/image_prep.yml b/playbooks/openshift-node/private/image_prep.yml
index 3c042acdc..b7ac27bda 100644
--- a/playbooks/openshift-node/private/image_prep.yml
+++ b/playbooks/openshift-node/private/image_prep.yml
@@ -1,21 +1,21 @@
---
- name: normalize groups
- include: ../../init/evaluate_groups.yml
+ import_playbook: ../../init/evaluate_groups.yml
- name: initialize the facts
- include: ../../init/facts.yml
+ import_playbook: ../../init/facts.yml
- name: initialize the repositories
- include: ../../init/repos.yml
+ import_playbook: ../../init/repos.yml
- name: run node config setup
- include: setup.yml
+ import_playbook: setup.yml
- name: run node config
- include: configure_nodes.yml
+ import_playbook: configure_nodes.yml
- name: Re-enable excluders
- include: enable_excluders.yml
+ import_playbook: enable_excluders.yml
- name: Remove any undesired artifacts from build
- include: clean_image.yml
+ import_playbook: clean_image.yml
diff --git a/playbooks/openshift-node/private/network_manager.yml b/playbooks/openshift-node/private/network_manager.yml
index c2efb0483..fffed4dfb 100644
--- a/playbooks/openshift-node/private/network_manager.yml
+++ b/playbooks/openshift-node/private/network_manager.yml
@@ -1,5 +1,5 @@
---
-- include: ../../init/evaluate_groups.yml
+- import_playbook: ../../init/evaluate_groups.yml
- name: Install and configure NetworkManager
hosts: oo_all_hosts
diff --git a/playbooks/openshift-node/restart.yml b/playbooks/openshift-node/restart.yml
index 5e28e274e..041c1384d 100644
--- a/playbooks/openshift-node/restart.yml
+++ b/playbooks/openshift-node/restart.yml
@@ -1,4 +1,4 @@
---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
-- include: private/restart.yml
+- import_playbook: private/restart.yml
diff --git a/playbooks/openshift-node/scaleup.yml b/playbooks/openshift-node/scaleup.yml
index b4c39e37e..bdfd3d3e6 100644
--- a/playbooks/openshift-node/scaleup.yml
+++ b/playbooks/openshift-node/scaleup.yml
@@ -1,5 +1,5 @@
---
-- include: ../init/evaluate_groups.yml
+- import_playbook: ../init/evaluate_groups.yml
- name: Ensure there are new_nodes
hosts: localhost
@@ -16,6 +16,6 @@
# Need a better way to do the above check for node without
# running evaluate_groups and init/main.yml
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
-- include: private/config.yml
+- import_playbook: private/config.yml