diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-12 14:12:25 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-12 14:12:25 -0400 |
| commit | e284ee1c2dba7f6ceeedf8af4adc60a795721166 (patch) | |
| tree | 7733fb6d89df77d42c2fdb10467a8d9a43bc8c99 /playbooks/common | |
| parent | 1ebd068ceaf1bb10af4de149f5474327a607760f (diff) | |
| parent | 4ac07696f3db92d1361290c3a0d7b7637d3d1994 (diff) | |
| download | openshift-e284ee1c2dba7f6ceeedf8af4adc60a795721166.tar.gz openshift-e284ee1c2dba7f6ceeedf8af4adc60a795721166.tar.bz2 openshift-e284ee1c2dba7f6ceeedf8af4adc60a795721166.tar.xz openshift-e284ee1c2dba7f6ceeedf8af4adc60a795721166.zip | |
Merge pull request #1705 from abutcher/secure-router
Add support for creating secure router
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/additional_config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index 1ac78468a..44bf962c9 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -49,8 +49,6 @@ openshift_serviceaccounts_namespace: default openshift_serviceaccounts_sccs: - privileged - - role: openshift_router - when: deploy_infra | bool - role: openshift_registry registry_volume_claim: "{{ openshift.hosted.registry.storage.volume.name }}-claim" when: deploy_infra | bool and attach_registry_volume | bool diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 2411e7360..6f908fa7f 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -34,3 +34,5 @@ - include: additional_config.yml - include: ../openshift-node/config.yml + +- include: openshift_hosted.yml diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml new file mode 100644 index 000000000..1cbc0f544 --- /dev/null +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -0,0 +1,5 @@ +- name: Create Hosted Resources + hosts: oo_first_master + roles: + - role: openshift_hosted + openshift_hosted_router_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}" |