diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-04 13:37:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-04 13:37:50 +0000 |
| commit | eb131a7db26d9d1830b3e30f9aaf964b72f87a23 (patch) | |
| tree | 67cd21ab4387d6b6f8750c2cd2c26499eb569b54 | |
| parent | d80f638b093ed60241ae0c81cbae6499d5d64c69 (diff) | |
| parent | f1821ae63a4e376df854f8fc937d88d6777e8f0b (diff) | |
| download | kolla-eb131a7db26d9d1830b3e30f9aaf964b72f87a23.tar.gz kolla-eb131a7db26d9d1830b3e30f9aaf964b72f87a23.zip | |
Merge "Remove unused params for kolla_docker"
| -rw-r--r-- | ansible/group_vars/all.yml | 7 | ||||
| -rw-r--r-- | ansible/library/kolla_docker.py | 1 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 8 |
3 files changed, 1 insertions, 15 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 71c1e53c6..57e630bb3 100644 --- a/ansible/group_vars/all.yml +++ b/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 }}" diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index 59b1d1ad3..3a1958c7c 100644 --- a/ansible/library/kolla_docker.py +++ b/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), diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 62feb5ddb..a5179e732 100644 --- a/etc/kolla/globals.yml +++ b/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" #################### |