diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-28 14:00:23 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-28 14:00:23 -0400 |
| commit | 8dd04af47c574a0e4c98f5cab55283be04fa1683 (patch) | |
| tree | 7fa25006f802a36feb8db5af2a2f7b60abba42ca /roles/openshift_master_ca | |
| parent | 68223f205b6c4e6ea124ccc982cd9bbcba63ced6 (diff) | |
| parent | 1b3fff6248fbd6788a26ee2b6c60f7731891c0f4 (diff) | |
| download | openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.gz openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.bz2 openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.xz openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.zip | |
Merge pull request #512 from sdodson/next
Merge in Atomic Enterprise work into master
Diffstat (limited to 'roles/openshift_master_ca')
| -rw-r--r-- | roles/openshift_master_ca/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_master_ca/vars/main.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master_ca/tasks/main.yml b/roles/openshift_master_ca/tasks/main.yml index 03eb7e15f..303dc9c5d 100644 --- a/roles/openshift_master_ca/tasks/main.yml +++ b/roles/openshift_master_ca/tasks/main.yml @@ -1,6 +1,6 @@ --- -- name: Install the OpenShift package for admin tooling - yum: pkg=openshift state=present +- name: Install the base package for admin tooling + yum: pkg={{ openshift.common.service_type }} state=present register: install_result - name: Reload generated facts diff --git a/roles/openshift_master_ca/vars/main.yml b/roles/openshift_master_ca/vars/main.yml index 2925680bb..1f6af808c 100644 --- a/roles/openshift_master_ca/vars/main.yml +++ b/roles/openshift_master_ca/vars/main.yml @@ -1,5 +1,5 @@ --- -openshift_master_config_dir: /etc/openshift/master +openshift_master_config_dir: "{{ openshift.common.config_base }}/master" openshift_master_ca_cert: "{{ openshift_master_config_dir }}/ca.crt" openshift_master_ca_key: "{{ openshift_master_config_dir }}/ca.key" openshift_master_ca_serial: "{{ openshift_master_config_dir }}/ca.serial.txt" |