Merge "Do not loop profile resources on cloud without profiles defined"

This commit is contained in:
Jenkins 2016-05-27 10:36:35 +00:00 committed by Gerrit Code Review
commit abcd121c0b

View File

@ -19,7 +19,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- domains - domains
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- domains - domains
@ -45,7 +45,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- projects - projects
- { skip_missing: yes} - { skip_missing: yes}
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- projects - projects
@ -75,7 +75,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- users - users
- { skip_missing: yes} - { skip_missing: yes}
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- users - users
@ -101,7 +101,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- networks - networks
- { skip_missing: yes} - { skip_missing: yes}
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- networks - networks
@ -129,7 +129,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- subnets - subnets
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- subnets - subnets
@ -161,7 +161,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- routers - routers
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- routers - routers
@ -195,7 +195,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- flavors - flavors
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- flavors - flavors
@ -237,7 +237,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- images - images
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- images - images
@ -261,7 +261,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- security_groups - security_groups
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- security_groups - security_groups
@ -297,7 +297,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- security_groups_rules - security_groups_rules
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- security_groups_rules - security_groups_rules
@ -323,7 +323,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- keypairs - keypairs
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- keypairs - keypairs
@ -357,7 +357,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- volumes - volumes
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- volumes - volumes
@ -427,7 +427,7 @@
- "{{ profiles|default([]) }}" - "{{ profiles|default([]) }}"
- servers - servers
- { skip_missing: yes } - { skip_missing: yes }
when: "{{ item.0.name in item_cloud.profiles }}" when: "{{ item_cloud.profiles is defined and item.0.name in item_cloud.profiles }}"
tags: tags:
- servers - servers
register: os_server_result register: os_server_result