summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-02-03 16:27:30 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-02-09 15:51:35 -0500
commitd30acfb23637525cf79cd05c94d0d3c900cc4b88 (patch)
tree8b92294835b3c945e246fa09cbb70b0a50d7b07a /playbooks/common/openshift-master
parent34455e0f4f2d4b6ea0b21703f711448e947bf0c7 (diff)
downloadopenshift-d30acfb23637525cf79cd05c94d0d3c900cc4b88.tar.gz
openshift-d30acfb23637525cf79cd05c94d0d3c900cc4b88.tar.bz2
openshift-d30acfb23637525cf79cd05c94d0d3c900cc4b88.tar.xz
openshift-d30acfb23637525cf79cd05c94d0d3c900cc4b88.zip
openshift_serviceaccounts updates
- make service account creation more flexible - create service accounts near where they are consumed
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml25
1 files changed, 16 insertions, 9 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 648a63150..a4da68573 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -405,19 +405,11 @@
- file: name={{ g_master_mktemp.stdout }} state=absent
changed_when: False
-- name: Configure service accounts
- hosts: oo_first_master
- vars:
- roles:
- - openshift_serviceaccounts
-
-- name: Create persistent volumes and services
+- name: Create persistent volumes
hosts: oo_first_master
vars:
persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups) }}"
persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims }}"
- attach_registry_volume: "{{ openshift.hosted.registry.storage.kind != None }}"
- deploy_infra: "{{ openshift.master.infra_nodes | default(0) | length > 0 }}"
pre_tasks:
- set_fact:
nfs_host: "{{ groups.oo_nfs_to_config.0 }}"
@@ -426,6 +418,21 @@
roles:
- role: openshift_persistent_volumes
when: persistent_volumes | length > 0 or persistent_volume_claims | length > 0
+
+- name: Create hosted infrastructure services
+ hosts: oo_first_master
+ vars:
+ accounts: ["router", "registry"]
+ attach_registry_volume: "{{ openshift.hosted.registry.storage.kind != None }}"
+ deploy_infra: "{{ openshift.master.infra_nodes | default(0) | length > 0 }}"
+ roles:
+ - role: openshift_serviceaccounts
+ openshift_serviceaccounts_names:
+ - router
+ - registry
+ openshift_serviceaccounts_namespace: default
+ openshift_serviceaccounts_sccs:
+ - privileged
- role: openshift_router
when: deploy_infra | bool
- role: openshift_registry