summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-09-11 11:11:56 -0400
committerSteve Milner <smilner@redhat.com>2017-09-11 11:15:14 -0400
commitab973c72397d8890465cf9c315b79d2ec73d4a62 (patch)
tree89c7568edd46b8e471e308e43f7f3028c83f01d5 /inventory
parent69f03840248a0adadb38b73d9155393af9b069fb (diff)
downloadopenshift-ab973c72397d8890465cf9c315b79d2ec73d4a62.tar.gz
openshift-ab973c72397d8890465cf9c315b79d2ec73d4a62.tar.bz2
openshift-ab973c72397d8890465cf9c315b79d2ec73d4a62.tar.xz
openshift-ab973c72397d8890465cf9c315b79d2ec73d4a62.zip
container-engine: Allow full image override
openshift_docker_systemcontainer_image_registry_override has been replaced with openshift_docker_systemcontainer_image_override. The difference is openshift_docker_systemcontainer_image_override takes a full image path including the tag. Example: openshift_docker_systemcontainer_image_override=gscrivano/container-engine:latest Signed-off-by: Steve Milner <smilner@redhat.com>
Diffstat (limited to 'inventory')
-rw-r--r--inventory/byo/hosts.origin.example2
-rw-r--r--inventory/byo/hosts.ose.example2
2 files changed, 2 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index df0491d71..093651dc5 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -118,7 +118,7 @@ openshift_release=v3.6
# Force the registry to use for the docker/crio system container. By default the registry
# will be built off of the deployment type and ansible_distribution. Only
# use this option if you are sure you know what you are doing!
-#openshift_docker_systemcontainer_image_registry_override="registry.example.com"
+#openshift_docker_systemcontainer_image_override="registry.example.com/container-engine:latest"
#openshift_crio_systemcontainer_image_registry_override="registry.example.com"
# Items added, as is, to end of /etc/sysconfig/docker OPTIONS
# Default value: "--log-driver=journald"
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 79eb59ab9..c56af80cf 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -118,7 +118,7 @@ openshift_release=v3.6
# Force the registry to use for the container-engine/crio system container. By default the registry
# will be built off of the deployment type and ansible_distribution. Only
# use this option if you are sure you know what you are doing!
-#openshift_docker_systemcontainer_image_registry_override="registry.example.com"
+#openshift_docker_systemcontainer_image_override="registry.example.com/container-engine:latest"
#openshift_crio_systemcontainer_image_registry_override="registry.example.com"
# Items added, as is, to end of /etc/sysconfig/docker OPTIONS
# Default value: "--log-driver=journald"