Merge pull request #45 from ktibi/patch-5

add credentiels config for registry

ansible/container-image-build.yml

@@ -31,6 +31,12 @@
         owner: "{{ ansible_user }}"
         group: "{{ ansible_user }}"
       become: True
+      
+    - name: Login to docker registry
+      docker_login:
+        username: "{{ kolla_docker_registry_username }}"
+        password: "{{ kolla_docker_registry_password }}"
+      when: kolla_docker_registry_username is not none and kolla_docker_registry_password is not none
 
     - name: Ensure Kolla container images are built
       shell: >

ansible/group_vars/all/kolla

@@ -55,6 +55,12 @@ kolla_install_type: "binary"
 # Docker namespace to use for Kolla images.
 kolla_docker_namespace: "stackhpc"
 
+# Username to use to access a docker registry.
+kolla_docker_registry_username:
+
+# Password to use to access a docker registry.
+kolla_docker_registry_password:
+
 # Kolla OpenStack release version. This should be a Docker image tag.
 kolla_openstack_release: "5.0.0"
 

ansible/roles/kolla-ansible/templates/globals.yml.j2

@@ -54,8 +54,11 @@ node_custom_config: "{{ kolla_node_custom_config_path }}"
 
 #docker_registry: "172.16.0.10:4000"
 docker_namespace: "{{ kolla_docker_namespace }}"
-#docker_registry_username: "sam"
-#docker_registry_password: "correcthorsebatterystaple"
+{% if kolla_docker_namespace_username and kolla_docker_namespace_password %}
+docker_registry_username: "{{ kolla_docker_registry_username }}"
+docker_registry_password: "{{ kolla_docker_registry_password }}"
+{% endif %}
+
 
 
 ####################

etc/kayobe/kolla.yml

@@ -57,6 +57,12 @@
 # Docker namespace to use for Kolla images.
 #kolla_docker_namespace:
 
+# Username to use to access a docker registry.
+#kolla_docker_registry_username:
+
+# Password to use to access a docker registry.
+#kolla_docker_registry_password:
+
 # Kolla OpenStack release version. This should be a Docker image tag.
 #kolla_openstack_release: