diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-26 17:38:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 17:38:26 -0800 |
| commit | 65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8 (patch) | |
| tree | 03ce2701a4550fb4a996fc4edfae94c363fdc271 /openshift-ansible.spec | |
| parent | ef8e18254cd96b7b68a5e01ee0b2ae6b3a10d3c6 (diff) | |
| parent | 7dceb6260a333e29c922dad8613ae6a0946fa07b (diff) | |
| download | openshift-65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8.tar.gz openshift-65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8.tar.bz2 openshift-65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8.tar.xz openshift-65d69eca7dc6ac71c25a6a5c9a3936e2bb49a5d8.zip | |
Merge pull request #6840 from yocum137/rm_origin-components
Automatic merge from submit-queue.
moving files to their correct <role>/files location
The openshift_web_console and template_service_broker roles are putting 'files' outside the openshift-ansible roles they belong to.
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 dbc4fb3e5..6db02c779 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -65,9 +65,6 @@ rm -f %{buildroot}%{python_sitelib}/openshift_ansible/gce mkdir -p docs/example-inventories cp inventory/hosts.* inventory/README.md docs/example-inventories/ -# openshift-ansible-files install -cp -rp files %{buildroot}%{_datadir}/ansible/%{name}/ - # openshift-ansible-playbooks install cp -rp playbooks %{buildroot}%{_datadir}/ansible/%{name}/ # remove contiv plabooks @@ -101,7 +98,6 @@ popd %doc README* %license LICENSE %dir %{_datadir}/ansible/%{name} -%{_datadir}/ansible/%{name}/files %{_datadir}/ansible/%{name}/inventory/dynamic %ghost %{_datadir}/ansible/%{name}/playbooks/common/openshift-master/library.rpmmoved |