diff options
| author | Russell Teague <rteague@redhat.com> | 2017-03-23 10:49:57 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-03-27 15:48:50 -0400 |
| commit | 2c7a6849096a2e1e5b8799cdc07753ab3852c561 (patch) | |
| tree | 8276ee7d1db5f4488e00bbd8a1b7696bc13604b2 /roles/openshift_node | |
| parent | a22e780b21eacf9ae7fc067d9f26e1a01c1d4558 (diff) | |
| download | openshift-2c7a6849096a2e1e5b8799cdc07753ab3852c561.tar.gz openshift-2c7a6849096a2e1e5b8799cdc07753ab3852c561.tar.bz2 openshift-2c7a6849096a2e1e5b8799cdc07753ab3852c561.tar.xz openshift-2c7a6849096a2e1e5b8799cdc07753ab3852c561.zip | |
Use meta/main.yml for role dependencies
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/node_system_container.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/openvswitch_system_container.yml | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml index 10036abed..c97ff1b4b 100644 --- a/roles/openshift_node/meta/main.yml +++ b/roles/openshift_node/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: categories: - cloud dependencies: +- role: lib_openshift - role: openshift_common - role: openshift_clock - role: openshift_docker diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml index abe139418..d99f657bc 100644 --- a/roles/openshift_node/tasks/node_system_container.yml +++ b/roles/openshift_node/tasks/node_system_container.yml @@ -1,8 +1,4 @@ --- -- name: Load lib_openshift modules - include_role: - name: lib_openshift - - name: Pre-pull node system container image command: > atomic pull --storage=ostree {{ openshift.common.system_images_registry }}/{{ openshift.node.node_system_image }}:{{ openshift_image_tag }} diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml index b76ce8797..8cfa5a026 100644 --- a/roles/openshift_node/tasks/openvswitch_system_container.yml +++ b/roles/openshift_node/tasks/openvswitch_system_container.yml @@ -1,8 +1,4 @@ --- -- name: Load lib_openshift modules - include_role: - name: lib_openshift - - name: Pre-pull OpenVSwitch system container image command: > atomic pull --storage=ostree {{ openshift.common.system_images_registry }}/{{ openshift.node.ovs_system_image }}:{{ openshift_image_tag }} |