summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-27 16:38:45 -0800
committerGitHub <noreply@github.com>2018-01-27 16:38:45 -0800
commit97888898a8de6dc37510f384b8eab351b11c9df3 (patch)
tree1560596fc71128eebd447c54f3bca62c339514d2
parentc099618499368c59a15024f5dc733d05ebc82c53 (diff)
parent894a24e96062aa88a3a5aa10d27faff765e10652 (diff)
downloadopenshift-97888898a8de6dc37510f384b8eab351b11c9df3.tar.gz
openshift-97888898a8de6dc37510f384b8eab351b11c9df3.tar.bz2
openshift-97888898a8de6dc37510f384b8eab351b11c9df3.tar.xz
openshift-97888898a8de6dc37510f384b8eab351b11c9df3.zip
Merge pull request #6886 from smarterclayton/playbooks/gcp/openshift-cluster/build_base_image.yml
Automatic merge from submit-queue. Add GPG keys in the base image and don't install docker Base image fails to accept the keys.
-rw-r--r--playbooks/gcp/openshift-cluster/build_base_image.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/gcp/openshift-cluster/build_base_image.yml b/playbooks/gcp/openshift-cluster/build_base_image.yml
index 75d0ddf9d..8e9b0024a 100644
--- a/playbooks/gcp/openshift-cluster/build_base_image.yml
+++ b/playbooks/gcp/openshift-cluster/build_base_image.yml
@@ -90,6 +90,8 @@
repo_gpgcheck: no
state: present
when: ansible_os_family == "RedHat"
+ - name: Accept GPG keys for the repos
+ command: yum -q makecache -y --disablerepo='*' --enablerepo='google-cloud,jdetiber-qemu-user-static'
- name: Install qemu-user-static
package:
name: qemu-user-static
@@ -121,7 +123,6 @@
with_items:
# required by Ansible
- PyYAML
- - docker
- google-compute-engine
- google-compute-engine-init
- google-config