diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-30 14:14:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 14:14:18 -0700 |
| commit | 62cb2a8d573928cb54a7d0ba475d61a6b65e0307 (patch) | |
| tree | 74dc3c17224fe6d2b3bd4dfffc521e348c74eeb8 /openshift-ansible.spec | |
| parent | 99c3117df11f1d6b5240dc72f57b2f7f541a234a (diff) | |
| parent | b649749bac0a086199820f91f85fe42ba99f206e (diff) | |
| download | openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.gz openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.bz2 openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.xz openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.zip | |
Merge pull request #5449 from abutcher/wildcard-router-cert-redeploy
Automatic merge from submit-queue.
Bug 1490186: Router pod not running after router certificates redeployment
This carries https://github.com/openshift/openshift-ansible/pull/5417. More of the router cert redeploy logic could be moved into the `openshift_hosted` role with a flag. I may pull those over.
https://bugzilla.redhat.com/show_bug.cgi?id=1490186
Diffstat (limited to 'openshift-ansible.spec')
| -rw-r--r-- | openshift-ansible.spec | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 769929095..91df8c965 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -84,10 +84,6 @@ touch %{buildroot}%{_datadir}/ansible/%{name}/roles/contiv/.empty_dir pushd %{buildroot}%{_datadir}/ansible/%{name}/roles/openshift_master_facts/filter_plugins ln -sf ../../../../../ansible_plugins/filter_plugins/oo_filters.py oo_filters.py popd -# openshift_master_facts symlinks lookup_plugins/oo_option.py from ansible_plugins/lookup_plugins -pushd %{buildroot}%{_datadir}/ansible/%{name}/roles/openshift_master_facts/lookup_plugins -ln -sf ../../../../../ansible_plugins/lookup_plugins/oo_option.py oo_option.py -popd # openshift-ansible-filter-plugins install cp -rp filter_plugins %{buildroot}%{_datadir}/ansible_plugins/ |