diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-24 08:10:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 08:10:53 -0500 |
| commit | 7e112b2c5893623dcd059813c993b0fab57e58b4 (patch) | |
| tree | fb226772ec0f0273cef60f903ab7f3bd17d06e68 /openshift-ansible.spec | |
| parent | dd5c2a24872490f34be8516e4f03a4076be35789 (diff) | |
| parent | f2b14d2e76d8a9b19d9515f00c0eac85876363f5 (diff) | |
| download | openshift-7e112b2c5893623dcd059813c993b0fab57e58b4.tar.gz openshift-7e112b2c5893623dcd059813c993b0fab57e58b4.tar.bz2 openshift-7e112b2c5893623dcd059813c993b0fab57e58b4.tar.xz openshift-7e112b2c5893623dcd059813c993b0fab57e58b4.zip | |
Merge pull request #6541 from smarterclayton/move_gcp_in
Allow openshift-ansible image to deploy to GCP
Diffstat (limited to 'openshift-ansible.spec')
| -rw-r--r-- | openshift-ansible.spec | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec index c09e14c66..719e54eb9 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -48,7 +48,8 @@ popd %install # Base openshift-ansible install mkdir -p %{buildroot}%{_datadir}/%{name} -mkdir -p %{buildroot}%{_datadir}/ansible/%{name} +mkdir -p %{buildroot}%{_datadir}/ansible/%{name}/inventory +cp -rp inventory/dynamic %{buildroot}%{_datadir}/ansible/%{name}/inventory # openshift-ansible-bin install mkdir -p %{buildroot}%{_bindir} @@ -62,7 +63,7 @@ rm -f %{buildroot}%{python_sitelib}/openshift_ansible/gce # openshift-ansible-docs install # Install example inventory into docs/examples mkdir -p docs/example-inventories -cp inventory/* docs/example-inventories/ +cp inventory/hosts.* inventory/README.md docs/example-inventories/ # openshift-ansible-files install cp -rp files %{buildroot}%{_datadir}/ansible/%{name}/ @@ -101,6 +102,7 @@ popd %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 # ---------------------------------------------------------------------------------- |