diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-11 13:51:05 -0500 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-20 16:36:23 -0500 |
| commit | 2ed396b31243a87c7c02e9338e15a83feec61e46 (patch) | |
| tree | db2d24f127164a7ec3ccc6f788e0d8fef7fe28d2 /roles/openshift_service_catalog | |
| parent | 4f5839e585a78243eae2d215176047299c52a1eb (diff) | |
| download | openshift-2ed396b31243a87c7c02e9338e15a83feec61e46.tar.gz openshift-2ed396b31243a87c7c02e9338e15a83feec61e46.tar.bz2 openshift-2ed396b31243a87c7c02e9338e15a83feec61e46.tar.xz openshift-2ed396b31243a87c7c02e9338e15a83feec61e46.zip | |
Updating to always configure api aggregation with installation
Diffstat (limited to 'roles/openshift_service_catalog')
| -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 |