diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-15 14:01:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 14:01:00 -0400 |
| commit | 0862f7b6f1448d6ea1fe6c836b3ba1de0afb4485 (patch) | |
| tree | 1a77af9e1a76d66a0826f1bdc514a7b658bed39a /images/installer/system-container/root | |
| parent | 96b98a07e6cc6a7fb437383d5716d8147dd22fcd (diff) | |
| parent | 12123e816abf6c066b8fafe0abd231bd383e16c5 (diff) | |
| download | openshift-0862f7b6f1448d6ea1fe6c836b3ba1de0afb4485.tar.gz openshift-0862f7b6f1448d6ea1fe6c836b3ba1de0afb4485.tar.bz2 openshift-0862f7b6f1448d6ea1fe6c836b3ba1de0afb4485.tar.xz openshift-0862f7b6f1448d6ea1fe6c836b3ba1de0afb4485.zip | |
Merge pull request #4460 from ashcrow/system-container-ansible-cfg
System container honor provided ansible cfg
Diffstat (limited to 'images/installer/system-container/root')
| -rw-r--r-- | images/installer/system-container/root/exports/config.json.template | 3 | ||||
| -rw-r--r-- | images/installer/system-container/root/exports/manifest.json | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/images/installer/system-container/root/exports/config.json.template b/images/installer/system-container/root/exports/config.json.template index 397ac941a..739c0080f 100644 --- a/images/installer/system-container/root/exports/config.json.template +++ b/images/installer/system-container/root/exports/config.json.template @@ -21,7 +21,8 @@ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "TERM=xterm", "OPTS=$OPTS", - "PLAYBOOK_FILE=$PLAYBOOK_FILE" + "PLAYBOOK_FILE=$PLAYBOOK_FILE", + "ANSIBLE_CONFIG=$ANSIBLE_CONFIG" ], "cwd": "/opt/app-root/src/", "rlimits": [ diff --git a/images/installer/system-container/root/exports/manifest.json b/images/installer/system-container/root/exports/manifest.json index f735494d4..321a84ee8 100644 --- a/images/installer/system-container/root/exports/manifest.json +++ b/images/installer/system-container/root/exports/manifest.json @@ -6,6 +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", "INVENTORY_FILE": "/dev/null" } } |