Switch to tripleomaster registry by default

The tripleoupstream registry is deprecated in favor of tripleomaster,
where images are pushed automatically on rdo promotion.

Change-Id: I84724efedb6e7ff967469d0e4277aa6fd9538748
This commit is contained in:
Martin André 2017-11-14 10:25:15 +01:00
parent a2668a3277
commit ef09083b58
4 changed files with 13 additions and 4 deletions

View File

@ -0,0 +1,9 @@
---
feature:
- |
Switch to tripleomaster registry be default for container images, where
push happens automaticallyon RDO promotion.
deprecations:
- |
The tripleoupstream container registry is not used anymore and may be
retired in the future.

View File

@ -29,7 +29,7 @@ Role Variables
for libvirt environments.
- `local_docker_registry_host`: <"{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"> -- host of the local (undercloud) docker registry
- `docker_registry_host`: <'docker.io'> -- host of the primary docker registry
- `docker_registry_namespace`: <'tripleoupstream'> -- namespace of
- `docker_registry_namespace`: <'tripleomaster'> -- namespace of
docker images used for TripleO deployment
- `docker_image_tag`: <'latest'> -- tag of docker images used for
TripleO deployment

View File

@ -5,7 +5,7 @@ containerized_overcloud: false
containerized_undercloud: false
containerized_overcloud_upgrade: false
local_docker_registry_host: "{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"
docker_registry_namespace: tripleoupstream
docker_registry_namespace: tripleomaster
docker_registry_host: docker.io
docker_image_tag: latest
additional_insecure_registry: false

View File

@ -218,7 +218,7 @@ example you may want to deploy:
* containerized Keystone,
* optional containerized Etcd,
with disabled telemetry, docker images from `docker.io/tripleoupstream`,
with disabled telemetry, docker images from `docker.io/tripleomaster`,
debug logs for services and puppet, given a decent timeout, and keeping
the ephemeral undercloud heat agent running for debug purposes:
@ -245,7 +245,7 @@ resource_registry:
OS::TripleO::Services: ../docker/services/services.yaml
parameter_defaults:
DockerNamespace: tripleoupstream
DockerNamespace: tripleomaster
DockerNamespaceIsRegistry: false
ComputeServices: {}
SwiftCeilometerPipelineEnabled: false