diff options
| author | Russell Teague <rteague@redhat.com> | 2017-03-14 16:12:29 -0400 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-03-17 14:09:53 -0400 |
| commit | 94251afea2f1f58aabf0ae0f3ca544dd8f1dd368 (patch) | |
| tree | 023dfe7528663bb4aef29e9916244fca35634003 | |
| parent | d86b2700328761c30d4525941804425164126a9d (diff) | |
| download | openshift-94251afea2f1f58aabf0ae0f3ca544dd8f1dd368.tar.gz openshift-94251afea2f1f58aabf0ae0f3ca544dd8f1dd368.tar.bz2 openshift-94251afea2f1f58aabf0ae0f3ca544dd8f1dd368.tar.xz openshift-94251afea2f1f58aabf0ae0f3ca544dd8f1dd368.zip | |
Moving projects task within openshift_hosted
| -rw-r--r-- | roles/openshift_hosted/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_hosted/tasks/main.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_hosted/vars/main.yml | 10 | ||||
| -rw-r--r-- | roles/openshift_projects/tasks/main.yml | 7 |
4 files changed, 17 insertions, 9 deletions
diff --git a/roles/openshift_hosted/meta/main.yml b/roles/openshift_hosted/meta/main.yml index bbbb76414..9626c23c1 100644 --- a/roles/openshift_hosted/meta/main.yml +++ b/roles/openshift_hosted/meta/main.yml @@ -15,5 +15,3 @@ dependencies: - role: openshift_cli - role: openshift_hosted_facts - role: lib_openshift -- role: openshift_projects - openshift_projects: "{{ openshift_additional_projects | default({}) | oo_merge_dicts({'default':{'default_node_selector':''},'openshift-infra':{'default_node_selector':''},'logging':{'default_node_selector':''}}) }}" diff --git a/roles/openshift_hosted/tasks/main.yml b/roles/openshift_hosted/tasks/main.yml index fe254f72d..6efe2f63c 100644 --- a/roles/openshift_hosted/tasks/main.yml +++ b/roles/openshift_hosted/tasks/main.yml @@ -1,4 +1,11 @@ --- +- name: Create projects + oc_project: + name: "{{ item.key }}" + node_selector: + - "{{ item.value.default_node_selector }}" + with_dict: "{{ openshift_projects }}" + - include: router/router.yml when: openshift_hosted_manage_router | default(true) | bool diff --git a/roles/openshift_hosted/vars/main.yml b/roles/openshift_hosted/vars/main.yml index 521578cd0..0821d0e7e 100644 --- a/roles/openshift_hosted/vars/main.yml +++ b/roles/openshift_hosted/vars/main.yml @@ -1,3 +1,13 @@ --- openshift_master_config_dir: "{{ openshift.common.config_base }}/master" registry_config_secret_name: registry-config + +openshift_default_projects: + default: + default_node_selector: '' + logging: + default_node_selector: '' + openshift-infra: + default_node_selector: '' + +openshift_projects: "{{ openshift_additional_projects | default({}) | oo_merge_dicts(openshift_default_projects) }}" diff --git a/roles/openshift_projects/tasks/main.yml b/roles/openshift_projects/tasks/main.yml deleted file mode 100644 index e7252ee99..000000000 --- a/roles/openshift_projects/tasks/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Create projects - oc_project: - name: "{{ item.key }}" - node_selector: - - "{{ item.value.default_node_selector }}" - with_dict: "{{ openshift_projects }}" |