diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-06-17 14:04:44 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-06-17 14:04:44 -0400 |
| commit | a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd (patch) | |
| tree | 065562cf45a0fb03a6cd66844ee655188325685d /roles/openshift_master/tasks | |
| parent | e903a6b5be49728e31756e5114f7c6ed2553747a (diff) | |
| parent | 7b316631a2b988318b47d3a50a7b66e3ff3fdbd2 (diff) | |
| download | openshift-a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd.tar.gz openshift-a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd.tar.bz2 openshift-a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd.tar.xz openshift-a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd.zip | |
Merge pull request #285 from sdodson/rc-merge
RC2 Merge
Diffstat (limited to 'roles/openshift_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 23f8b4649..da0a663ec 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -8,6 +8,15 @@ - openshift_master_oauth_grant_method in openshift_master_valid_grant_methods when: openshift_master_oauth_grant_method is defined +- name: Install OpenShift Master package + yum: pkg=openshift-master state=present + register: install_result + +# TODO: Is this necessary or was this a workaround for an old bug in packaging? +- name: Reload systemd units + command: systemctl daemon-reload + when: install_result | changed + - name: Set master OpenShift facts openshift_facts: role: master @@ -51,14 +60,6 @@ domain: cluster.local when: openshift.master.embedded_dns -- name: Install OpenShift Master package - yum: pkg=openshift-master state=present - register: install_result - -- name: Reload systemd units - command: systemctl daemon-reload - when: install_result | changed - - name: Create config parent directory if it doesn't exist file: path: "{{ openshift_master_config_dir }}" @@ -130,7 +131,7 @@ - name: Create the OpenShift client config dir(s) file: - path: "~{{ item }}/.config/openshift" + path: "~{{ item }}/.kube" state: directory mode: 0700 owner: "{{ item }}" @@ -142,16 +143,16 @@ # TODO: Update this file if the contents of the source file are not present in # the dest file, will need to make sure to ignore things that could be added - name: Copy the OpenShift admin client config(s) - command: cp {{ openshift_master_config_dir }}/admin.kubeconfig ~{{ item }}/.config/openshift/.config + command: cp {{ openshift_master_config_dir }}/admin.kubeconfig ~{{ item }}/.kube/config args: - creates: ~{{ item }}/.config/openshift/.config + creates: ~{{ item }}/.kube/config with_items: - root - "{{ ansible_ssh_user }}" - name: Update the permissions on the OpenShift admin client config(s) file: - path: "~{{ item }}/.config/openshift/.config" + path: "~{{ item }}/.kube/config" state: file mode: 0700 owner: "{{ item }}" |