Add docker-registry service

This is required for the containerized undercloud.

Change-Id: I542a19c084f37aaafd72378857af4f379f335a39

environments/ssl/tls-endpoints-public-dns.yaml

@@ -30,6 +30,7 @@ parameter_defaults:
     CongressAdmin: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
     CongressInternal: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
     CongressPublic: {protocol: 'https', port: '13789', host: 'CLOUDNAME'}
+    DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'CLOUDNAME'}
     Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
     Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
     Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}

environments/ssl/tls-endpoints-public-ip.yaml

@@ -30,6 +30,7 @@ parameter_defaults:
     CongressAdmin: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
     CongressInternal: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
     CongressPublic: {protocol: 'https', port: '13789', host: 'IP_ADDRESS'}
+    DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'IP_ADDRESS'}
     Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
     Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
     Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'IP_ADDRESS'}

environments/ssl/tls-everywhere-endpoints-dns.yaml

@@ -30,6 +30,7 @@ parameter_defaults:
     CongressAdmin: {protocol: 'https', port: '1789', host: 'CLOUDNAME'}
     CongressInternal: {protocol: 'https', port: '1789', host: 'CLOUDNAME'}
     CongressPublic: {protocol: 'https', port: '13789', host: 'CLOUDNAME'}
+    DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'CLOUDNAME'}
     Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
     Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
     Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}

environments/tls-endpoints-public-dns.yaml

@@ -24,6 +24,7 @@ parameter_defaults:
     CongressAdmin: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
     CongressInternal: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
     CongressPublic: {protocol: 'https', port: '13789', host: 'CLOUDNAME'}
+    DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'CLOUDNAME'}
     Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
     Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
     Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}

environments/tls-endpoints-public-ip.yaml

@@ -24,6 +24,7 @@ parameter_defaults:
     CongressAdmin: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
     CongressInternal: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
     CongressPublic: {protocol: 'https', port: '13789', host: 'IP_ADDRESS'}
+    DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'IP_ADDRESS'}
     Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
     Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
     Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'IP_ADDRESS'}

environments/tls-everywhere-endpoints-dns.yaml

@@ -20,6 +20,7 @@ parameter_defaults:
     CongressAdmin: {protocol: 'https', port: '1789', host: 'CLOUDNAME'}
     CongressInternal: {protocol: 'https', port: '1789', host: 'CLOUDNAME'}
     CongressPublic: {protocol: 'https', port: '13789', host: 'CLOUDNAME'}
+    DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'CLOUDNAME'}
     Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
     Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
     Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}

environments/undercloud.yaml

@@ -3,6 +3,7 @@ resource_registry:
   OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
   OS::TripleO::Undercloud::Net::SoftwareConfig: ../net-config-undercloud.yaml
   OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml
+  OS::TripleO::Services::DockerRegistry: ../puppet/services/docker-registry.yaml
 
 parameter_defaults:
   EnablePackageInstall: true

network/endpoints/endpoint_data.yaml

@@ -349,3 +349,8 @@ Octavia:
     Admin:
         net_param: OctaviaApi
     port: 9876
+
+DockerRegistry:
+    Internal:
+        net_param: DockerRegistry
+    port: 8787

network/endpoints/endpoint_map.yaml

@@ -37,6 +37,7 @@ parameters:
       CongressAdmin: {protocol: http, port: '1789', host: IP_ADDRESS}
       CongressInternal: {protocol: http, port: '1789', host: IP_ADDRESS}
       CongressPublic: {protocol: http, port: '1789', host: IP_ADDRESS}
+      DockerRegistryInternal: {protocol: http, port: '8787', host: IP_ADDRESS}
       Ec2ApiAdmin: {protocol: http, port: '8788', host: IP_ADDRESS}
       Ec2ApiInternal: {protocol: http, port: '8788', host: IP_ADDRESS}
       Ec2ApiPublic: {protocol: http, port: '8788', host: IP_ADDRESS}
@@ -2095,6 +2096,87 @@ outputs:
                         template: NETWORK_uri
             port:
               get_param: [EndpointMap, CongressPublic, port]
+      DockerRegistryInternal:
+        host:
+          str_replace:
+            template:
+              get_param: [EndpointMap, DockerRegistryInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, DockerRegistryNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - str_replace:
+                    params:
+                      NETWORK:
+                        get_param: [ServiceNetMap, DockerRegistryNetwork]
+                    template: NETWORK_uri
+        host_nobrackets:
+          str_replace:
+            template:
+              get_param: [EndpointMap, DockerRegistryInternal, host]
+            params:
+              CLOUDNAME:
+                get_param:
+                - CloudEndpoints
+                - get_param: [ServiceNetMap, DockerRegistryNetwork]
+              IP_ADDRESS:
+                get_param:
+                - NetIpMap
+                - get_param: [ServiceNetMap, DockerRegistryNetwork]
+        port:
+          get_param: [EndpointMap, DockerRegistryInternal, port]
+        protocol:
+          get_param: [EndpointMap, DockerRegistryInternal, protocol]
+        uri:
+          make_url:
+            scheme:
+              get_param: [EndpointMap, DockerRegistryInternal, protocol]
+            host:
+              str_replace:
+                template:
+                  get_param: [EndpointMap, DockerRegistryInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, DockerRegistryNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, DockerRegistryNetwork]
+                        template: NETWORK_uri
+            port:
+              get_param: [EndpointMap, DockerRegistryInternal, port]
+        uri_no_suffix:
+          make_url:
+            scheme:
+              get_param: [EndpointMap, DockerRegistryInternal, protocol]
+            host:
+              str_replace:
+                template:
+                  get_param: [EndpointMap, DockerRegistryInternal, host]
+                params:
+                  CLOUDNAME:
+                    get_param:
+                    - CloudEndpoints
+                    - get_param: [ServiceNetMap, DockerRegistryNetwork]
+                  IP_ADDRESS:
+                    get_param:
+                    - NetIpMap
+                    - str_replace:
+                        params:
+                          NETWORK:
+                            get_param: [ServiceNetMap, DockerRegistryNetwork]
+                        template: NETWORK_uri
+            port:
+              get_param: [EndpointMap, DockerRegistryInternal, port]
       Ec2ApiAdmin:
         host:
           str_replace:

network/service_net_map.j2.yaml

@@ -79,6 +79,7 @@ parameters:
       OvnDbsNetwork: internal_api
       MistralApiNetwork: internal_api
       ZaqarApiNetwork: internal_api
+      DockerRegistryNetwork: ctlplane
       PacemakerRemoteNetwork: internal_api
       # We special-case the default ResolveNetwork for the CephStorage role
       # for backwards compatibility, all other roles default to internal_api

overcloud-resource-registry-puppet.j2.yaml

@@ -303,6 +303,7 @@ resource_registry:
   OS::TripleO::Services::Vpp: OS::Heat::None
   OS::TripleO::Services::NeutronVppAgent: OS::Heat::None
   OS::TripleO::Services::Docker: OS::Heat::None
+  OS::TripleO::Services::DockerRegistry: OS::Heat::None
   OS::TripleO::Services::CertmongerUser: OS::Heat::None
   OS::TripleO::Services::Clustercheck: OS::Heat::None
   OS::TripleO::Services::RsyslogSidecar: OS::Heat::None

puppet/services/docker-registry.yaml

@@ -0,0 +1,49 @@
+heat_template_version: queens
+
+description: >
+  Configures docker-registry on a host.
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+
+outputs:
+  role_data:
+    description: Role data for the docker registry service
+    value:
+      service_name: docker_registry
+      config_settings:
+        tripleo::profile::base::docker_registry::registry_host:
+          {get_param: [ServiceNetMap, DockerRegistryNetwork]}
+        tripleo::profile::base::docker_registry::registry_port:
+          {get_param: [EndpointMap, DockerRegistryInternal, port]}
+      step_config: |
+        include ::tripleo::profile::base::docker_registry
+      upgrade_tasks:
+        - name: Install docker packages on upgrade if missing
+          tags: step3
+          yum: name=docker-distribution state=latest

roles/Undercloud.yaml

@@ -13,6 +13,7 @@
   ServicesDefault:
     - OS::TripleO::Services::Apache
     - OS::TripleO::Services::Docker
+    - OS::TripleO::Services::DockerRegistry
     - OS::TripleO::Services::GlanceApi
     - OS::TripleO::Services::HeatApi
     - OS::TripleO::Services::HeatApiCfn

roles/UndercloudLight.yaml

@@ -15,6 +15,7 @@
   ServicesDefault:
     - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Docker
+    - OS::TripleO::Services::DockerRegistry
     - OS::TripleO::Services::HeatApi
     - OS::TripleO::Services::HeatApiCfn
     - OS::TripleO::Services::HeatEngine

roles_data_undercloud.yaml

@@ -16,6 +16,7 @@
   ServicesDefault:
     - OS::TripleO::Services::Apache
     - OS::TripleO::Services::Docker
+    - OS::TripleO::Services::DockerRegistry
     - OS::TripleO::Services::GlanceApi
     - OS::TripleO::Services::HeatApi
     - OS::TripleO::Services::HeatApiCfn

sample-env-generator/ssl.yaml

@@ -125,6 +125,7 @@ environments:
             CongressAdmin: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
             CongressInternal: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
             CongressPublic: {protocol: 'https', port: '13789', host: 'IP_ADDRESS'}
+            DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'IP_ADDRESS'}
             Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
             Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
             Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'IP_ADDRESS'}
@@ -226,6 +227,7 @@ environments:
             CongressAdmin: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
             CongressInternal: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
             CongressPublic: {protocol: 'https', port: '13789', host: 'CLOUDNAME'}
+            DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'CLOUDNAME'}
             Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
             Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
             Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}
@@ -327,6 +329,7 @@ environments:
             CongressAdmin: {protocol: 'https', port: '1789', host: 'CLOUDNAME'}
             CongressInternal: {protocol: 'https', port: '1789', host: 'CLOUDNAME'}
             CongressPublic: {protocol: 'https', port: '13789', host: 'CLOUDNAME'}
+            DockerRegistryInternal: {protocol: 'https', port: '8787', host: 'CLOUDNAME'}
             Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
             Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
             Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}