Merge "Add region to task output"

This commit is contained in:
Zuul 2018-11-07 00:29:55 +00:00 committed by Gerrit Code Review
commit fa10b18a4f
14 changed files with 14 additions and 14 deletions

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing domain {{ item_domain.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing domain {{ item_domain.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_keystone_domain: os_keystone_domain:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_domain.state|default(omit) }}" state: "{{ item_domain.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing flavor {{ item_flavor.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing flavor {{ item_flavor.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_nova_flavor: os_nova_flavor:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_flavor.state|default(omit) }}" state: "{{ item_flavor.state|default(omit) }}"

View File

@ -9,7 +9,7 @@
force: "{{ item_image.download_image_force|default(download_image_force) }}" force: "{{ item_image.download_image_force|default(download_image_force) }}"
when: not openstack_image when: not openstack_image
when: item_image.download_image_url is defined when: item_image.download_image_url is defined
- name: "Processing image {{ item_image.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing image {{ item_image.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_image: os_image:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_image.state|default(omit) }}" state: "{{ item_image.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing keypair {{ item_keypair.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing keypair {{ item_keypair.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_keypair: os_keypair:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_keypair.state|default(omit) }}" state: "{{ item_keypair.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing network {{ item_network.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing network {{ item_network.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_network: os_network:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_network.state|default(omit) }}" state: "{{ item_network.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing project {{ item_project.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing project {{ item_project.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_project: os_project:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_project.state|default(omit) }}" state: "{{ item_project.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing quotas for project {{ item_quota.name }}" - name: "Processing quotas for project {{ item_quota.name }} in {{ item_cloud.name }} {{ item_cloud.region_name|default('') }}"
command: openstack quota set --"{{ item.key }}" "{{ item.value }}" "{{ item_quota.name }}" command: openstack quota set --"{{ item.key }}" "{{ item.value }}" "{{ item_quota.name }}"
environment: environment:
OS_CLOUD: "{{ item_cloud.name }}" OS_CLOUD: "{{ item_cloud.name }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing router {{ item_router.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing router {{ item_router.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_router: os_router:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_router.state|default(omit) }}" state: "{{ item_router.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing security_group_rule for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing security_group_rule for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_security_group_rule: os_security_group_rule:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_security_group_rule.state|default(omit) }}" state: "{{ item_security_group_rule.state|default(omit) }}"

View File

@ -2,7 +2,7 @@
- include: generate_keypair.yml - include: generate_keypair.yml
when: generate_keypair|bool when: generate_keypair|bool
- name: "Processing server {{ item_server.name }}" - name: "Processing server {{ item_server.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_server: os_server:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_server.state|default(omit) }}" state: "{{ item_server.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing subnet {{ item_subnet.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing subnet {{ item_subnet.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_subnet: os_subnet:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_subnet.state|default(omit) }}" state: "{{ item_subnet.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing user {{ item_user.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing user {{ item_user.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_user: os_user:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_user.state|default(omit) }}" state: "{{ item_user.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing user role {{ item_user_role.role }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing user role {{ item_user_role.role }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_user_role: os_user_role:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_user_role.state|default(omit) }}" state: "{{ item_user_role.state|default(omit) }}"

View File

@ -1,5 +1,5 @@
--- ---
- name: "Processing volume {{ item_volume.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }}" - name: "Processing volume {{ item_volume.name }} for {{ item_cloud.oscc_cloud|default(item_cloud.name) }} {{ item_cloud.region_name|default('') }}"
os_volume: os_volume:
cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}" cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
state: "{{ item_volume.state|default(omit) }}" state: "{{ item_volume.state|default(omit) }}"