summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-20 09:30:17 -0500
committerGitHub <noreply@github.com>2017-12-20 09:30:17 -0500
commita5de165b8e7113631a30ef0e4a20b5f74db073f0 (patch)
treee617e6e099562437ece02ed432afccb61d6318b8 /playbooks
parent33450f75b336744615c066a34d7391cc9996af18 (diff)
parent5c6af565bfae851b493c8b4670d56f69016de3bb (diff)
downloadopenshift-a5de165b8e7113631a30ef0e4a20b5f74db073f0.tar.gz
openshift-a5de165b8e7113631a30ef0e4a20b5f74db073f0.tar.bz2
openshift-a5de165b8e7113631a30ef0e4a20b5f74db073f0.tar.xz
openshift-a5de165b8e7113631a30ef0e4a20b5f74db073f0.zip
Merge pull request #6524 from kwoodson/docker_storage_setup_overlay
Adding support for docker-storage-setup on overlay
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/container-runtime/private/setup_storage.yml16
-rw-r--r--playbooks/container-runtime/setup_storage.yml6
-rw-r--r--playbooks/prerequisites.yml2
3 files changed, 24 insertions, 0 deletions
diff --git a/playbooks/container-runtime/private/setup_storage.yml b/playbooks/container-runtime/private/setup_storage.yml
new file mode 100644
index 000000000..97226d6b2
--- /dev/null
+++ b/playbooks/container-runtime/private/setup_storage.yml
@@ -0,0 +1,16 @@
+---
+- hosts: "{{ l_containerized_host_groups }}"
+ vars:
+ l_chg_temp: "{{ openshift_containerized_host_groups | default([]) }}"
+ l_containerized_host_groups: "{{ (['oo_nodes_to_config'] | union(l_chg_temp)) | join(':') }}"
+ # role: container_runtime is necessary here to bring role default variables
+ # into the play scope.
+ roles:
+ - role: container_runtime
+ tasks:
+ - include_role:
+ name: container_runtime
+ tasks_from: docker_storage_setup_overlay.yml
+ when:
+ - container_runtime_docker_storage_type|default('') == "overlay2"
+ - openshift_docker_is_node_or_master | bool
diff --git a/playbooks/container-runtime/setup_storage.yml b/playbooks/container-runtime/setup_storage.yml
new file mode 100644
index 000000000..98e876b2c
--- /dev/null
+++ b/playbooks/container-runtime/setup_storage.yml
@@ -0,0 +1,6 @@
+---
+- import_playbook: ../init/main.yml
+ vars:
+ skip_verison: True
+
+- import_playbook: private/setup_storage.yml
diff --git a/playbooks/prerequisites.yml b/playbooks/prerequisites.yml
index 5ba62a6d6..68d7f3359 100644
--- a/playbooks/prerequisites.yml
+++ b/playbooks/prerequisites.yml
@@ -11,4 +11,6 @@
roles:
- role: os_firewall
+- import_playbook: container-runtime/private/setup_storage.yml
+
- import_playbook: container-runtime/private/config.yml