diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-20 21:29:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 21:29:15 -0700 |
| commit | a3906249b7a1752bb6fb42da6ceb72279fd67e90 (patch) | |
| tree | 19ae5e28c280ebe0046233184d852cfe6628d205 /roles | |
| parent | d58fe2d712e7445f55d63431968ccf00ac3df2f4 (diff) | |
| parent | 2ed396b31243a87c7c02e9338e15a83feec61e46 (diff) | |
| download | openshift-a3906249b7a1752bb6fb42da6ceb72279fd67e90.tar.gz openshift-a3906249b7a1752bb6fb42da6ceb72279fd67e90.tar.bz2 openshift-a3906249b7a1752bb6fb42da6ceb72279fd67e90.tar.xz openshift-a3906249b7a1752bb6fb42da6ceb72279fd67e90.zip | |
Merge pull request #5363 from ewolinetz/default_aggregation
Automatic merge from submit-queue
Updating to always configure api aggregation with installation
This moves the wiring of the aggregator up into the config playbook as we want to enable this by default with an installation.
Resolves https://github.com/openshift/openshift-ansible/issues/5056
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_service_catalog/tasks/install.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/tasks/wire_aggregator.yml | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml index 746c73eaf..d134867bd 100644 --- a/roles/openshift_service_catalog/tasks/install.yml +++ b/roles/openshift_service_catalog/tasks/install.yml @@ -6,8 +6,6 @@ register: mktemp changed_when: False -- include: wire_aggregator.yml - - name: Set default image variables based on deployment_type include_vars: "{{ item }}" with_first_found: diff --git a/roles/openshift_service_catalog/tasks/wire_aggregator.yml b/roles/openshift_service_catalog/tasks/wire_aggregator.yml index 1c788470a..6431c6d3f 100644 --- a/roles/openshift_service_catalog/tasks/wire_aggregator.yml +++ b/roles/openshift_service_catalog/tasks/wire_aggregator.yml @@ -18,11 +18,10 @@ changed_when: false delegate_to: "{{ first_master }}" - # TODO: this currently has a bug where hostnames are required - name: Creating First Master Aggregator signer certs command: > - oc adm ca create-signer-cert + {{ hostvars[first_master].openshift.common.client_binary }} adm ca create-signer-cert --cert=/etc/origin/master/front-proxy-ca.crt --key=/etc/origin/master/front-proxy-ca.key --serial=/etc/origin/master/ca.serial.txt @@ -79,7 +78,7 @@ - name: Create first master api-client config for Aggregator command: > - oc adm create-api-client-config + {{ hostvars[first_master].openshift.common.client_binary }} adm create-api-client-config --certificate-authority=/etc/origin/master/front-proxy-ca.crt --signer-cert=/etc/origin/master/front-proxy-ca.crt --signer-key=/etc/origin/master/front-proxy-ca.key |