Convert common role to kolla_docker

Change-Id: I793d89322d5be32972d10386f2feeb39cb57e5fe
Partially-Implements: blueprint kolla-docker-module
This commit is contained in:
SamYaple 2015-12-25 21:46:46 +00:00
parent ad262534d3
commit f770ea41cc

View File

@ -1,64 +1,35 @@
--- ---
- name: Starting log_data container - name: Starting log-data container
docker: kolla_docker:
tty: True action: "start_container"
net: host common_options: "{{ docker_common_options }}"
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
restart_policy_retry: "{{ docker_restart_policy_retry }}"
state: reloaded
registry: "{{ docker_registry }}"
username: "{{ docker_registry_username }}"
password: "{{ docker_registry_password }}"
insecure_registry: "{{ docker_insecure_registry }}"
name: log_data
image: "{{ log_data_image_full }}" image: "{{ log_data_image_full }}"
volumes: name: "log_data"
- "/var/log" volumes: "/var/log"
env:
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
- name: Starting rsyslog container - name: Starting rsyslog container
docker: kolla_docker:
tty: True action: "start_container"
net: host common_options: "{{ docker_common_options }}"
pull: "{{ docker_pull_policy }}"
restart_policy: "{{ docker_restart_policy }}"
restart_policy_retry: "{{ docker_restart_policy_retry }}"
state: reloaded
registry: "{{ docker_registry }}"
username: "{{ docker_registry_username }}"
password: "{{ docker_registry_password }}"
insecure_registry: "{{ docker_insecure_registry }}"
privileged: True
name: rsyslog
image: "{{ rsyslog_image_full }}" image: "{{ rsyslog_image_full }}"
volumes_from: name: "rsyslog"
- "log_data" privileged: True
volumes: volumes:
- "/var/lib/kolla/dev:/dev"
- "{{ node_config_directory }}/rsyslog/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/rsyslog/:{{ container_config_directory }}/:ro"
env: - "/var/lib/kolla/dev:/dev"
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" volumes_from: "log_data"
- name: Starting Ansible container - name: Starting kolla-ansible container
docker: kolla_docker:
tty: True action: "start_container"
net: host common_options: "{{ docker_common_options }}"
pull: "{{ docker_pull_policy }}" environment:
restart_policy: "{{ docker_restart_policy }}"
restart_policy_retry: "{{ docker_restart_policy_retry }}"
state: reloaded
registry: "{{ docker_registry }}"
username: "{{ docker_registry_username }}"
password: "{{ docker_registry_password }}"
insecure_registry: "{{ docker_insecure_registry }}"
name: kolla_ansible
image: "{{ ansible_image_full }}"
env:
ANSIBLE_NOCOLOR: "1" ANSIBLE_NOCOLOR: "1"
ANSIBLE_LIBRARY: "/usr/share/ansible" ANSIBLE_LIBRARY: "/usr/share/ansible"
image: "{{ ansible_image_full }}"
name: "kolla_ansible"
privileged: True
volumes: volumes:
- /var/lib/kolla/dev/log:/dev/log - "/dev/:/dev/"
- /dev/:/dev/ - "/run/:/run/"
- /run/:/run/ - "/var/lib/kolla/dev/log:/dev/log"