diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-10 08:20:24 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-10 10:02:41 -0400 |
| commit | c2f3f81d926aacbd1fe973c36931dc5ad2ebe7c5 (patch) | |
| tree | e8463d6f7b957ff54d67488ac1a70d4a00b7f755 | |
| parent | 35c3b7d15cfac7da748382dc4ad429ca78e7c74e (diff) | |
| download | openshift-c2f3f81d926aacbd1fe973c36931dc5ad2ebe7c5.tar.gz openshift-c2f3f81d926aacbd1fe973c36931dc5ad2ebe7c5.tar.bz2 openshift-c2f3f81d926aacbd1fe973c36931dc5ad2ebe7c5.tar.xz openshift-c2f3f81d926aacbd1fe973c36931dc5ad2ebe7c5.zip | |
Package the default ansible.cfg with atomic-openshift-utils.
If this file exists on disk, the installer will use it if the user didn't
specify an ansible config file on the CLI.
Rename share directory to match the rpm name. (utils vs util)
| -rw-r--r-- | openshift-ansible.spec | 3 | ||||
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 10a53d921..646352961 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -82,6 +82,8 @@ pushd utils %{__python} setup.py install --skip-build --root %{buildroot} # Remove this line once the name change has happened mv -f %{buildroot}%{_bindir}/oo-install %{buildroot}%{_bindir}/atomic-openshift-installer +mkdir -p %{buildroot}%{_datadir}/atomic-openshift-utils/ +cp etc/ansible.cfg %{buildroot}%{_datadir}/atomic-openshift-utils/ansible.cfg popd # Base openshift-ansible files @@ -252,6 +254,7 @@ Atomic OpenShift Utilities includes %files -n atomic-openshift-utils %{python_sitelib}/ooinstall* %{_bindir}/atomic-openshift-installer +%{_datadir}/atomic-openshift-utils/ansible.cfg %changelog diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index a40ff5cfc..08c2439f7 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -11,7 +11,7 @@ from ooinstall import OOConfig from ooinstall.oo_config import Host from ooinstall.variants import find_variant, get_variant_version_combos -DEFAULT_ANSIBLE_CONFIG = '/usr/share/atomic-openshift-util/ansible.cfg' +DEFAULT_ANSIBLE_CONFIG = '/usr/share/atomic-openshift-utils/ansible.cfg' DEFAULT_PLAYBOOK_DIR = '/usr/share/ansible/openshift-ansible/' def validate_ansible_dir(path): |