openstack/openstack-ansible
Code Issues Proposed changes

Fix container_group var for container playbooks

Browse Source 
Following on from #61, the container_group has to be specified each
time, this patch fixes that.

* Set the groups for "container_groups" appropriately
This commit is contained in:
Andy McCrae 2014-09-03 16:17:58 +01:00
parent ffda3fed0f
commit cc9ae15a6b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpc_deployment/playbooks/setup/build-containers.yml
View File

@ -18,7 +18,7 @@
roles: roles:
- container_create - container_create
vars: vars:
default_container_groups: "{{ groups[hostvars[inventory_hostname]['container_types']] }}" default_container_groups: "{{ hostvars[inventory_hostname]['container_types'] }}"
container_groups: "{{ groups[container_group]|default(default_container_groups) }}" container_groups: "{{ groups[container_group|default(default_container_groups)] }}"
- include: containers-setup.yml - include: containers-setup.yml

4
rpc_deployment/playbooks/setup/containers-setup.yml
View File

@ -20,8 +20,8 @@
vars_files: vars_files:
- vars/config_vars/container_interfaces.yml - vars/config_vars/container_interfaces.yml
vars: vars:
default_container_groups: "{{ groups[hostvars[inventory_hostname]['container_types']] }}" default_container_groups: "{{ hostvars[inventory_hostname]['container_types'] }}"
container_groups: "{{ groups[container_group]|default(default_container_groups) }}" container_groups: "{{ groups[container_group|default(default_container_groups)] }}"
required_container_config_options: required_container_config_options:
- "lxc.mount.entry=/openstack/log/{{ hostvars[item]['container_name'] }} var/log/{{ hostvars[item]['service_name'] }} none defaults,bind,rw 0 0" - "lxc.mount.entry=/openstack/log/{{ hostvars[item]['container_name'] }} var/log/{{ hostvars[item]['service_name'] }} none defaults,bind,rw 0 0"
- "lxc.mount.entry=/openstack/monitoring monitoring none defaults,bind,rw 0 0" - "lxc.mount.entry=/openstack/monitoring monitoring none defaults,bind,rw 0 0"

4
rpc_deployment/playbooks/setup/destroy-containers.yml
View File

@ -19,5 +19,5 @@
roles: roles:
- container_destroy - container_destroy
vars: vars:
default_container_groups: "{{ groups[hostvars[inventory_hostname]['container_types']] }}" default_container_groups: "{{ hostvars[inventory_hostname]['container_types'] }}"
container_groups: "{{ groups[container_group]|default(default_container_groups) }}" container_groups: "{{ groups[container_group|default(default_container_groups)] }}"

4
rpc_deployment/playbooks/setup/restart-containers.yml
View File

@ -19,5 +19,5 @@
roles: roles:
- container_restart - container_restart
vars: vars:
default_container_groups: "{{ groups[hostvars[inventory_hostname]['container_types']] }}" default_container_groups: "{{ hostvars[inventory_hostname]['container_types'] }}"
container_groups: "{{ groups[container_group]|default(default_container_groups) }}" container_groups: "{{ groups[container_group|default(default_container_groups)] }}"