Merge "Remove unused params for kolla_docker"

ansible/group_vars/all.yml

@@ -44,12 +44,8 @@ docker_registry_email:
 docker_registry:
 docker_namespace: "kollaglue"
 docker_registry_username:
-docker_insecure_registry: "False"
 
-# Valid options are [ missing, always ]
-docker_pull_policy: "always"
-
-# Valid options are [ no, on-failure, always ]
+# Valid options are [ never, on-failure, always ]
 docker_restart_policy: "always"
 
 # '0' means unlimited retries
@@ -63,7 +59,6 @@ docker_common_options:
     auth_username: "{{ docker_registry_username }}"
     environment:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    insecure_registry: "{{ docker_insecure_registry }}"
     restart_policy: "{{ docker_restart_policy }}"
     restart_retries: "{{ docker_restart_policy_retry }}"
 

ansible/library/kolla_docker.py

@@ -497,7 +497,6 @@ def generate_module():
         name=dict(required=False, type='str'),
         environment=dict(required=False, type='dict'),
         image=dict(required=False, type='str'),
-        insecure_registry=dict(required=False, type='bool', default=False),
         pid_mode=dict(required=False, type='str', choices=['host']),
         privileged=dict(required=False, type='bool', default=False),
         remove_on_exit=dict(required=False, type='bool', default=True),

etc/kolla/globals.yml

@@ -37,14 +37,6 @@ kolla_internal_address: "10.10.10.254"
 # docker_namespace: "companyname"
 # docker_registry_username: "sam"
 # docker_registry_password: "correcthorsebatterystaple"
-# docker_insecure_registry: "False"
-
-# The default behaviour when running the playbooks is to pull the latest image
-# available when running the playbooks. If a newer image is found, it will pull
-# that new image and recreate the containers. If this is not the behaviour you
-# want, this should be set to 'missing'
-# Valid options are [ always, missing ]
-#docker_pull_policy: "always"
 
 
 ####################