summaryrefslogtreecommitdiffstats
path: root/images
Commit message (Collapse)AuthorAgeFilesLines
* Add ANSIBLE_CONFIG to system container installerSteve Milner2017-06-152-1/+3
| | | | | | | | | 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
* Merge pull request #4433 from ashcrow/ansible-retriesScott Dodson2017-06-132-4/+4
|\ | | | | System Container and Ansible Retries
| * Update mounts in system container installerSteve Milner2017-06-132-4/+4
| | | | | | | | | | | | | | This change will allow retry files to be stored in $HOME_ROOT. - SSH_ROOT replaced with HOME_ROOT - /root[container] -> $HOME_ROOT[host]
* | installer: add bind mount for /etc/resolv.confGiuseppe Scrivano2017-06-131-0/+10
|/ | | | | | | | Use the DNS configuration from the host. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1460978 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #4330 from codificat/20170531-image-renameOpenShift Bot2017-06-082-4/+4
|\ | | | | Merged by openshift-bot
| * Rename container image to origin-ansible / ose-ansiblePep TurrĂ³ Mauri2017-06-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | As discussed in #4279 the container image is being renamed to openshift/origin-ansible (upstream) and openshift3/ose-ansible (downstream) for the "oc cluster up" use case, and more generally to make it fit the imageConfig.format configuration option. This updates references to the image name accordingly. Also updating references to playbook2image to account for recent moves of the repo/image.
* | fix up openshift-ansible for use with 'oc cluster up'Jeff Cantrill2017-06-061-1/+1
|/
* Fix container image build referencesPep TurrĂ³ Mauri2017-05-121-1/+1
| | | | | | | | | Updating some files to account for recent changes: - Commit fbadeb4 moved the location of the Dockerfiles - playbook2image is now available from the openshift org - downstream image is building with boto 2.34 Adjusting image build scripts and documentation to match these changes.
* Moving Dockerfile content to images dirjupierce2017-05-088-0/+355