summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-23 09:49:47 -0400
committerGitHub <noreply@github.com>2017-06-23 09:49:47 -0400
commit272288b9d7a771f72af1e6b9c3fbb68a1030b6a3 (patch)
tree407567e9e94bc52e496230112c51709a5d257601
parent0795a6bac36fa1bbfa46a9830384c0924d8b194e (diff)
parent8349ed6089ad100a5c34634c92520e9da9e86376 (diff)
downloadopenshift-272288b9d7a771f72af1e6b9c3fbb68a1030b6a3.tar.gz
openshift-272288b9d7a771f72af1e6b9c3fbb68a1030b6a3.tar.bz2
openshift-272288b9d7a771f72af1e6b9c3fbb68a1030b6a3.tar.xz
openshift-272288b9d7a771f72af1e6b9c3fbb68a1030b6a3.zip
Merge pull request #4559 from giuseppe/ansible-change-default-ansible-config
images, syscontainer: change default value for ANSIBLE_CONFIG
-rw-r--r--images/installer/system-container/root/exports/manifest.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/images/installer/system-container/root/exports/manifest.json b/images/installer/system-container/root/exports/manifest.json
index 321a84ee8..8b984d7a3 100644
--- a/images/installer/system-container/root/exports/manifest.json
+++ b/images/installer/system-container/root/exports/manifest.json
@@ -6,7 +6,7 @@
"VAR_LOG_OPENSHIFT_LOG": "/var/log/ansible.log",
"PLAYBOOK_FILE": "/usr/share/ansible/openshift-ansible/playbooks/byo/config.yml",
"HOME_ROOT": "/root",
- "ANSIBLE_CONFIG": "/usr/share/ansible/openshift-ansible/ansible.cfg",
+ "ANSIBLE_CONFIG": "/usr/share/atomic-openshift-utils/ansible.cfg",
"INVENTORY_FILE": "/dev/null"
}
}