diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-15 16:37:48 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-15 16:37:48 -0300 |
| commit | e7925364342c9a324d91e750ba56aa41ad789419 (patch) | |
| tree | 289116d3a701ad67730794f8bcf7d71dbdc657f4 /roles/openshift_node/tasks | |
| parent | 1d764a0bebbbb12e3c3142c59b10fae34c8b7211 (diff) | |
| parent | 30d653aa5b776afbf35c98b1b5e7436f8cb7123c (diff) | |
| download | openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.gz openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.bz2 openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.xz openshift-e7925364342c9a324d91e750ba56aa41ad789419.zip | |
Merge remote-tracking branch 'openshift/master' into project_config
Diffstat (limited to 'roles/openshift_node/tasks')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index e84e74b40..adffca252 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -6,6 +6,9 @@ - fail: msg: This role requres that osn_cluster_dns_ip is set 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'] - name: Install OpenShift Node package yum: pkg=openshift-node state=present @@ -33,6 +36,7 @@ registry_url: "{{ oreg_url | default(none) }}" debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}" portal_net: "{{ openshift_master_portal_net | default(None) }}" + kubelet_args: "{{ openshift_node_kubelet_args | default(None) }}" # TODO: add the validate parameter when there is a validation command to run - name: Create the Node config @@ -63,11 +67,13 @@ lineinfile: dest: /etc/sysconfig/docker regexp: '^OPTIONS=.*' - line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }} --selinux-enabled'" + line: "OPTIONS='--insecure-registry={{ openshift.node.portal_net }} \ +{% if ansible_selinux and ansible_selinux.status == '''enabled''' %}--selinux-enabled{% endif %}'" when: docker_check.stat.isreg - name: Allow NFS access for VMs seboolean: name=virt_use_nfs state=yes persistent=yes + when: ansible_selinux and ansible_selinux.status == "enabled" - name: Start and enable openshift-node service: name=openshift-node enabled=yes state=started |