diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-06-12 12:49:37 -0500 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-06-12 12:49:37 -0500 |
| commit | c650920bc7b0043e59fa3439f48f61d5fa211f2d (patch) | |
| tree | 3e1f882f5bc7fe419f13a134a71927cb6484fa86 /roles/openshift_common | |
| parent | 124ca40c134a40b2e6823ab3c4bfe329580d7eaa (diff) | |
| parent | 42806b6745c747843b71eaf08b62aeee5e450ab1 (diff) | |
| download | openshift-c650920bc7b0043e59fa3439f48f61d5fa211f2d.tar.gz openshift-c650920bc7b0043e59fa3439f48f61d5fa211f2d.tar.bz2 openshift-c650920bc7b0043e59fa3439f48f61d5fa211f2d.tar.xz openshift-c650920bc7b0043e59fa3439f48f61d5fa211f2d.zip | |
Merge branch 'master' into prod
Diffstat (limited to 'roles/openshift_common')
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_common/vars/main.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index c55677c3f..f76dd84ed 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -10,7 +10,9 @@ public_hostname: "{{ openshift_public_hostname | default(None) }}" public_ip: "{{ openshift_public_ip | default(None) }}" use_openshift_sdn: "{{ openshift_use_openshift_sdn | default(None) }}" + sdn_network_plugin_name: "{{ os_sdn_network_plugin_name | default(None) }}" deployment_type: "{{ openshift_deployment_type }}" + - name: Set hostname hostname: name={{ openshift.common.hostname }} diff --git a/roles/openshift_common/vars/main.yml b/roles/openshift_common/vars/main.yml index 9f657a2c7..8e7d71154 100644 --- a/roles/openshift_common/vars/main.yml +++ b/roles/openshift_common/vars/main.yml @@ -6,6 +6,4 @@ # interfaces) os_firewall_use_firewalld: False -openshift_cert_parent_dir: /var/lib/openshift -openshift_cert_relative_dir: openshift.local.certificates -openshift_cert_dir: "{{ openshift_cert_parent_dir }}/{{ openshift_cert_relative_dir }}" +openshift_data_dir: /var/lib/openshift |