Merge "Switch to tripleomaster registry by default"

releasenotes/notes/switch_to_tripleomaster_registry-fd195a8ec8ca511b.yaml

@@ -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.

roles/extras-common/README.md

@@ -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

roles/extras-common/defaults/main.yml

@@ -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

roles/undercloud-deploy/README.md

@@ -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