diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-20 15:01:38 -0500 |
| commit | 9410cdff9342fae80a3149c530b819e473996cce (patch) | |
| tree | cf26be9b05f3b97dbdafb7bae109b0707da0a0d4 /roles/openshift_master/vars | |
| parent | a2b745039bce597d419b03fdce39b4c6c69139f6 (diff) | |
| parent | bdedb63403ea582c4aaa5f56caed302f51744de2 (diff) | |
| download | openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.gz openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.bz2 openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.xz openshift-9410cdff9342fae80a3149c530b819e473996cce.zip | |
Merge pull request #1247 from openshift/master
Merge master into prod
Diffstat (limited to 'roles/openshift_master/vars')
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml index 534465451..fe88c3c16 100644 --- a/roles/openshift_master/vars/main.yml +++ b/roles/openshift_master/vars/main.yml @@ -1,11 +1,16 @@ --- openshift_master_config_dir: "{{ openshift.common.config_base }}/master" openshift_master_config_file: "{{ openshift_master_config_dir }}/master-config.yaml" +openshift_master_loopback_config: "{{ openshift_master_config_dir }}/openshift-master.kubeconfig" +loopback_context_string: "current-context: {{ openshift.master.loopback_context_name }}" openshift_master_scheduler_conf: "{{ openshift_master_config_dir }}/scheduler.json" openshift_master_session_secrets_file: "{{ openshift_master_config_dir }}/session-secrets.yaml" openshift_master_policy: "{{ openshift_master_config_dir }}/policy.json" openshift_version: "{{ openshift_pkg_version | default('') }}" +ha_svc_template_path: "{{ 'docker-cluster' if openshift.common.is_containerized | bool else 'native-cluster' }}" +ha_svc_svc_dir: "{{ '/etc/systemd/system' if openshift.common.is_containerized | bool else '/usr/lib/systemd/system' }}" + openshift_master_valid_grant_methods: - auto - prompt |