diff options
| author | Jonathan Holloway <jholloway@redhat.com> | 2017-08-09 01:02:37 -0500 |
|---|---|---|
| committer | Jonathan Holloway <jholloway@redhat.com> | 2017-08-09 01:03:31 -0500 |
| commit | 3f38fd0b62eb0e2397e9bef4bcf8227a33f5361c (patch) | |
| tree | 3444f3ae9c410547e4130997700cfc1beaebb8f8 /docker/defaults/defaults.yml | |
| parent | 67925826933fefa6bd778e288880e6bddc08cec9 (diff) | |
fix dockerfile gdeploy PyYAML pip/rpm conflict
* PyYAML is already installed via pip form glusto image and
gdeploy installs PyYAML as dependency from rpm. The resulting
conflict fails the container build.
Dockerfile: changed order of install, added glusto and pylint/pep8
defaults.yml: sets glusto defaults in container image
Change-Id: I47eaa1fbe74cc619043d975034083c5766e6acd1
Signed-off-by: Jonathan Holloway <jholloway@redhat.com>
Diffstat (limited to 'docker/defaults/defaults.yml')
| -rw-r--r-- | docker/defaults/defaults.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/defaults/defaults.yml b/docker/defaults/defaults.yml new file mode 100644 index 000000000..84d8e104d --- /dev/null +++ b/docker/defaults/defaults.yml @@ -0,0 +1,3 @@ +ssh_keyfile: "~/.ssh/id_rsa" +use_controlpersist: True +log_color: True |