summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-26 10:28:25 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-26 10:28:25 -0500
commit55a2f757ea3d81860cee54f30264275d059f754a (patch)
treeef3e0dc813b33551f12b453123fdd009922122f0
parent8cd494da04f31b2d163b703f03926785fe3de779 (diff)
parent31a4ba84873c364e1e0b347068697dadc992504a (diff)
downloadopenshift-55a2f757ea3d81860cee54f30264275d059f754a.tar.gz
openshift-55a2f757ea3d81860cee54f30264275d059f754a.tar.bz2
openshift-55a2f757ea3d81860cee54f30264275d059f754a.tar.xz
openshift-55a2f757ea3d81860cee54f30264275d059f754a.zip
Merge pull request #1504 from cben/centos-7-1602
libvirt: Upgrade to CentOS-7-x86_64-GenericCloud-1602.
-rw-r--r--README_libvirt.md2
-rw-r--r--playbooks/libvirt/openshift-cluster/vars.yml6
2 files changed, 3 insertions, 5 deletions
diff --git a/README_libvirt.md b/README_libvirt.md
index 3e5df2dca..7c02c522d 100644
--- a/README_libvirt.md
+++ b/README_libvirt.md
@@ -118,7 +118,7 @@ The following options can be passed via the `-o` flag of the `create` command or
* `image_url` (default to `http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2.xz`): URL of the QCOW2 image to download
* `image_name` (default to `CentOS-7-x86_64-GenericCloud.qcow2`): Name of the QCOW2 image to boot the VMs on
* `image_compression` (default to `xz`): Source QCOW2 compression (only xz supported at this time)
-* `image_sha256` (default to `9461006300d65172f5668d8875f2aad7b54f7ba4e9c5435d65a84a5a2d66e39b`): Expected SHA256 checksum of the downloaded image
+* `image_sha256` (default to `dd0f5e610e7c5ffacaca35ed7a78a19142a588f4543da77b61c1fb0d74400471`): Expected SHA256 checksum of the downloaded image
* `skip_image_download` (default to `no`): Skip QCOW2 image download. This requires the `image_name` QCOW2 image to be already present in `$HOME/libvirt-storage-pool-openshift-ansible`
Creating a cluster
diff --git a/playbooks/libvirt/openshift-cluster/vars.yml b/playbooks/libvirt/openshift-cluster/vars.yml
index c78b52867..f28245f88 100644
--- a/playbooks/libvirt/openshift-cluster/vars.yml
+++ b/playbooks/libvirt/openshift-cluster/vars.yml
@@ -23,13 +23,13 @@ deployment_vars:
origin:
image:
url: "{{ lookup('oo_option', 'image_url') |
- default('http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2.xz', True) }}"
+ default('http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1602.qcow2.xz', True) }}"
compression: "{{ lookup('oo_option', 'image_compression') |
default('xz', True) }}"
name: "{{ lookup('oo_option', 'image_name') |
default('CentOS-7-x86_64-GenericCloud.qcow2', True) }}"
sha256: "{{ lookup('oo_option', 'image_sha256') |
- default('9461006300d65172f5668d8875f2aad7b54f7ba4e9c5435d65a84a5a2d66e39b', True) }}"
+ default('dd0f5e610e7c5ffacaca35ed7a78a19142a588f4543da77b61c1fb0d74400471', True) }}"
ssh_user: openshift
sudo: yes
online:
@@ -42,5 +42,3 @@ deployment_vars:
enterprise: "{{ deployment_rhel7_ent_base }}"
openshift-enterprise: "{{ deployment_rhel7_ent_base }}"
atomic-enterprise: "{{ deployment_rhel7_ent_base }}"
-
-