diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-09-11 14:13:43 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-10-17 15:34:00 -0400 |
| commit | 47d2e205fa6c76ec66cd22b9100b561cd71e6976 (patch) | |
| tree | 6dd9459a73e60282cfa204abfb00ca998e2a11d7 /roles/openshift_node/defaults | |
| parent | 1d75eb325c0dbfd4614ab6e6535d07a2ea3ecbc3 (diff) | |
| download | openshift-47d2e205fa6c76ec66cd22b9100b561cd71e6976.tar.gz openshift-47d2e205fa6c76ec66cd22b9100b561cd71e6976.tar.bz2 openshift-47d2e205fa6c76ec66cd22b9100b561cd71e6976.tar.xz openshift-47d2e205fa6c76ec66cd22b9100b561cd71e6976.zip | |
Do not remove files for bootstrap if resolv or dns.
Diffstat (limited to 'roles/openshift_node/defaults')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 739b0d968..b310a8f64 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -4,7 +4,8 @@ openshift_node_debug_level: "{{ debug_level | default(2) }}" r_openshift_node_firewall_enabled: "{{ os_firewall_enabled | default(True) }}" r_openshift_node_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}" -openshift_service_type: "{{ openshift.common.service_type }}" +openshift_deployment_type: "{{ openshift_deployment_type | default('origin') }}" +openshift_service_type: "{{ 'origin' if openshift_deployment_type == 'origin' else 'atomic-openshift' }}" openshift_image_tag: '' @@ -17,7 +18,6 @@ openshift_node_ami_prep_packages: - openvswitch - docker - etcd -#- pcs - haproxy - dnsmasq - ntp @@ -54,7 +54,6 @@ openshift_node_ami_prep_packages: # - container-selinux # - atomic # -openshift_deployment_type: origin openshift_node_bootstrap: False |