diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-13 12:27:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 12:27:24 -0400 |
| commit | c31b418922ec5771888c22cd2d608596402c8a7e (patch) | |
| tree | c9ddc1effaad3b86d08a319d7be6b1f6e685f1e7 | |
| parent | bf200ebf489d509740147c9ce01c9e6c41e8bd92 (diff) | |
| parent | 8fb905e7b84da6139da0b74067f987df5317464b (diff) | |
| download | openshift-c31b418922ec5771888c22cd2d608596402c8a7e.tar.gz openshift-c31b418922ec5771888c22cd2d608596402c8a7e.tar.bz2 openshift-c31b418922ec5771888c22cd2d608596402c8a7e.tar.xz openshift-c31b418922ec5771888c22cd2d608596402c8a7e.zip | |
Merge pull request #4433 from ashcrow/ansible-retries
System Container and Ansible Retries
| -rw-r--r-- | ansible.cfg | 1 | ||||
| -rw-r--r-- | images/installer/system-container/root/exports/config.json.template | 6 | ||||
| -rw-r--r-- | images/installer/system-container/root/exports/manifest.json | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/ansible.cfg b/ansible.cfg index 034733684..0c74d63da 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -14,6 +14,7 @@ callback_plugins = callback_plugins/ forks = 20 host_key_checking = False retry_files_enabled = False +retry_files_save_path = ~/ansible-installer-retries nocows = True # Uncomment to use the provided BYO inventory diff --git a/images/installer/system-container/root/exports/config.json.template b/images/installer/system-container/root/exports/config.json.template index 718ce1d53..397ac941a 100644 --- a/images/installer/system-container/root/exports/config.json.template +++ b/images/installer/system-container/root/exports/config.json.template @@ -102,7 +102,7 @@ }, { "type": "bind", - "source": "$SSH_ROOT", + "source": "$HOME_ROOT/.ssh", "destination": "/opt/app-root/src/.ssh", "options": [ "bind", @@ -112,8 +112,8 @@ }, { "type": "bind", - "source": "$SSH_ROOT", - "destination": "/root/.ssh", + "source": "$HOME_ROOT", + "destination": "/root", "options": [ "bind", "rw", diff --git a/images/installer/system-container/root/exports/manifest.json b/images/installer/system-container/root/exports/manifest.json index 1db845965..f735494d4 100644 --- a/images/installer/system-container/root/exports/manifest.json +++ b/images/installer/system-container/root/exports/manifest.json @@ -5,7 +5,7 @@ "VAR_LIB_OPENSHIFT_INSTALLER" : "/var/lib/openshift-installer", "VAR_LOG_OPENSHIFT_LOG": "/var/log/ansible.log", "PLAYBOOK_FILE": "/usr/share/ansible/openshift-ansible/playbooks/byo/config.yml", - "SSH_ROOT": "/root/.ssh", + "HOME_ROOT": "/root", "INVENTORY_FILE": "/dev/null" } } |