Browse Source

Merge "[Queens] Enable container auth support" into stable/queens

tags/8.4.1
Zuul 1 month ago
parent
commit
7c79d1be15
1 changed files with 22 additions and 0 deletions
  1. 22
    0
      puppet/services/docker.yaml

+ 22
- 0
puppet/services/docker.yaml View File

@@ -68,6 +68,23 @@ parameters:
68 68
     default: ''
69 69
     description: User added to the docker group in order to use container commands.
70 70
     type: string
71
+  ContainerImageRegistryLogin:
72
+    type: boolean
73
+    default: false
74
+    description: Flag to enable container registry login actions during the deployment.
75
+                 Setting this to true will cause login calls to be performed during the
76
+                 deployment.
77
+  ContainerImageRegistryCredentials:
78
+    type: json
79
+    hidden: true
80
+    default: {}
81
+    description: |
82
+      Mapping of image registry hosts to login credentials. Must be in the following example format
83
+
84
+        docker.io:
85
+          username: pa55word
86
+        '192.0.2.1:8787':
87
+          registry_username: password
71 88
 
72 89
 conditions:
73 90
   insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
@@ -75,6 +92,7 @@ conditions:
75 92
   service_debug_unset: {equals : [{get_param: DockerDebug}, '']}
76 93
   deployment_user_is_empty: {equals : [{get_param: DeploymentUser}, '']}
77 94
   additional_sockets_is_empty: {equals : [{get_param: DockerAdditionalSockets}, []]}
95
+  container_registry_login: {equals: [{get_param: ContainerImageRegistryLogin}, true]}
78 96
 
79 97
 outputs:
80 98
   role_data:
@@ -111,6 +129,10 @@ outputs:
111 129
             - additional_sockets_is_empty
112 130
             - {}
113 131
             - tripleo::profile::base::docker::additional_sockets: {get_param: DockerAdditionalSockets}
132
+          - if:
133
+            - container_registry_login
134
+            - tripleo::profile::base::docker::registry_credentials: {get_param: ContainerImageRegistryCredentials }
135
+            - {}
114 136
       step_config: |
115 137
         include ::tripleo::profile::base::docker
116 138
       upgrade_tasks:

Loading…
Cancel
Save