diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-04-11 15:45:26 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-04-11 15:45:26 -0400 |
| commit | 4ac07696f3db92d1361290c3a0d7b7637d3d1994 (patch) | |
| tree | 58ec00b29f982a9cd78b80bcf4aed1763a91bec3 /playbooks/common | |
| parent | 1bc6b51585c23670fdc08a1df6a89d35cd0b8149 (diff) | |
| download | openshift-4ac07696f3db92d1361290c3a0d7b7637d3d1994.tar.gz openshift-4ac07696f3db92d1361290c3a0d7b7637d3d1994.tar.bz2 openshift-4ac07696f3db92d1361290c3a0d7b7637d3d1994.tar.xz openshift-4ac07696f3db92d1361290c3a0d7b7637d3d1994.zip | |
Add support for creating secure router.
* Move openshift_router to openshift_hosted role which will eventually
contain registry, metrics and logging.
* Adds option for specifying an openshift_hosted_router_certificate
cert and key pair.
* Removes dependency on node label variables and retrieves the node
list from the API s.t. this role can be applied to any cluster with
existing nodes. I've added an openshift_hosted playbook that occurs
after node install to account for this.
* Infrastructure nodes are selected using
openshift_hosted_router_selector which is based on deployment type
by default; openshift-enterprise -> "region=infra" and online ->
"type=infra".
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 }}" |