diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-05 16:27:43 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-05 16:27:43 -0500 |
commit | c73ec7b6b27483aea4bb53db0db9837ff9781d24 (patch) | |
tree | 27ab3e06fe896997bf0f59b0ac3b6b54728f4425 /roles/openshift_node | |
parent | d01f131de68bf88e4e3fb4c81450922a30285804 (diff) | |
parent | 11e7783d4b4177f100ecea8a8ffafbfb07ec47ee (diff) | |
download | openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.gz openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.bz2 openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.xz openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.zip |
Merge pull request #608 from abutcher/native-ha
Native Support for Multi-Master HA
Diffstat (limited to 'roles/openshift_node')
-rw-r--r-- | roles/openshift_node/meta/main.yml | 1 | ||||
-rw-r--r-- | roles/openshift_node/tasks/main.yml | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml index c92008a77..9d40ae3b3 100644 --- a/roles/openshift_node/meta/main.yml +++ b/roles/openshift_node/meta/main.yml @@ -13,3 +13,4 @@ galaxy_info: - cloud dependencies: - { role: openshift_common } +- { role: docker } diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index aea60b75c..c455a09f1 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -8,7 +8,7 @@ when: osn_cluster_dns_ip is not defined or not osn_cluster_dns_ip - fail: msg: "SELinux is disabled, This deployment type requires that SELinux is enabled." - when: (not ansible_selinux or ansible_selinux.status != 'enabled') and deployment_type in ['enterprise', 'online'] + when: (not ansible_selinux or ansible_selinux.status != 'enabled') and deployment_type in ['enterprise', 'online', 'atomic-enterprise', 'openshift-enterprise'] - name: Set node facts openshift_facts: @@ -45,6 +45,15 @@ register: sdn_install_result when: openshift.common.use_openshift_sdn +- name: Install Node package + yum: pkg={{ openshift.common.service_type }}-node state=present + register: node_install_result + +- name: Install sdn-ovs package + yum: pkg={{ openshift.common.service_type }}-sdn-ovs state=present + register: sdn_install_result + when: openshift.common.use_openshift_sdn + # TODO: add the validate parameter when there is a validation command to run - name: Create the Node config template: |