diff options
| author | Steve Milner <smilner@redhat.com> | 2017-06-15 10:28:46 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-06-15 10:28:46 -0400 |
| commit | 554f29b1ae5827e1e6f2573405209858554808a1 (patch) | |
| tree | f0d4be09c9f5bb4b1a4543529d4762be67df5d40 /images/installer | |
| parent | 58960f7599c564c8e72ae8afb8d5a3804a4d7737 (diff) | |
| download | openshift-554f29b1ae5827e1e6f2573405209858554808a1.tar.gz openshift-554f29b1ae5827e1e6f2573405209858554808a1.tar.bz2 openshift-554f29b1ae5827e1e6f2573405209858554808a1.tar.xz openshift-554f29b1ae5827e1e6f2573405209858554808a1.zip | |
Add ANSIBLE_CONFIG to system container installer
The provided configuration file was not being honored. This change adds
a new variable called ANSIBLE_CONFIG which points to the ansible.cfg
file within the container. By default it is set to the configuration
provided by openshift-ansible within the container at:
/usr/share/ansible/openshift-ansible/ansible.cfg
Diffstat (limited to 'images/installer')
| -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" } } |