openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove unused params for kolla_docker"

Browse Source
This commit is contained in:
Jenkins 2016-01-04 13:37:50 +00:00 committed by Gerrit Code Review
commit eb131a7db2
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/group_vars/all.yml
View File

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

1
ansible/library/kolla_docker.py
View File

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

8
etc/kolla/globals.yml
View File

@ -37,14 +37,6 @@ kolla_internal_address: "10.10.10.254"
# docker_namespace: "companyname" # docker_namespace: "companyname"
# docker_registry_username: "sam" # docker_registry_username: "sam"
# docker_registry_password: "correcthorsebatterystaple" # 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"
#################### ####################