From 11483dafd464c6fd09bccbdb938dee5e08f5785b Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 25 Aug 2016 13:30:42 -0400 Subject: [PATCH] Initial support for regions This is the first attempt at adding support for regions. Change-Id: If9f7b8b72cc03678e6bd4e188f9dbeaca56b82a1 Signed-off-by: Paul Belanger --- resources.yml.sample | 9 ++++++++- tasks/create_domain.yml | 1 + tasks/create_flavor.yml | 1 + tasks/create_image.yml | 1 + tasks/create_keypair.yml | 1 + tasks/create_network.yml | 1 + tasks/create_project.yml | 1 + tasks/create_router.yml | 1 + tasks/create_security_group.yml | 1 + tasks/create_security_group_rule.yml | 1 + tasks/create_server.yml | 1 + tasks/create_subnet.yml | 1 + tasks/create_user.yml | 1 + tasks/create_volume.yml | 1 + 14 files changed, 21 insertions(+), 1 deletion(-) diff --git a/resources.yml.sample b/resources.yml.sample index cbdde31..6381dc9 100644 --- a/resources.yml.sample +++ b/resources.yml.sample @@ -164,8 +164,15 @@ clouds: profiles: - bootstrap-keypair - ops - - name: yaycloud-qa + - name: yaycloud-qa-dfw oscc_cloud: yaycloud-qauser + region_name: DFW + profiles: + - bootstrap-keypair + - qa + - name: yaycloud-qa-ord + oscc_cloud: yaycloud-qauser + region_name: ORD profiles: - bootstrap-keypair - qa diff --git a/tasks/create_domain.yml b/tasks/create_domain.yml index 754bba2..fa6b20a 100644 --- a/tasks/create_domain.yml +++ b/tasks/create_domain.yml @@ -4,3 +4,4 @@ state: "{{ item_domain.state|default(omit) }}" name: "{{ item_domain.name }}" description: "{{ item_domain.description|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_flavor.yml b/tasks/create_flavor.yml index e6c11bd..0b4e10a 100644 --- a/tasks/create_flavor.yml +++ b/tasks/create_flavor.yml @@ -9,3 +9,4 @@ swap: "{{ item_flavor.swap|default(omit) }}" ephemeral: "{{ item_flavor.ephemeral|default(omit) }}" rxtx_factor: "{{ item_flavor.rxtx_factor|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_image.yml b/tasks/create_image.yml index 4d37430..b2a2a9e 100644 --- a/tasks/create_image.yml +++ b/tasks/create_image.yml @@ -13,3 +13,4 @@ owner: "{{ item_image.owner|default(omit) }}" properties: "{{ item_image.properties|default(omit) }}" is_public: "{{ item_image.is_public|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_keypair.yml b/tasks/create_keypair.yml index 3a38bb9..846b565 100644 --- a/tasks/create_keypair.yml +++ b/tasks/create_keypair.yml @@ -5,3 +5,4 @@ name: "{{ item_keypair.name }}" public_key: "{{ item_keypair.public_key|default(omit) }}" public_key_file: "{{ item_keypair.public_key_file|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_network.yml b/tasks/create_network.yml index 62c4808..57e885d 100644 --- a/tasks/create_network.yml +++ b/tasks/create_network.yml @@ -5,3 +5,4 @@ name: "{{ item_network.name }}" external: "{{ item_network.external|default(omit) }}" project: "{{ item_network.project|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_project.yml b/tasks/create_project.yml index 3391b10..906f591 100644 --- a/tasks/create_project.yml +++ b/tasks/create_project.yml @@ -5,3 +5,4 @@ name: "{{ item_project.name }}" description: "{{ item_project.description|default(omit) }}" domain: "{{ item_project.domain|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_router.yml b/tasks/create_router.yml index 14aa5b5..fda42b2 100644 --- a/tasks/create_router.yml +++ b/tasks/create_router.yml @@ -8,3 +8,4 @@ enable_snat: "{{ item_router.enable_snat|default(omit) }}" external_fixed_ips: "{{ item_router.external_fixed_ips|default(omit) }}" interfaces: "{{ item_router.interfaces|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_security_group.yml b/tasks/create_security_group.yml index d47aca8..a71bd94 100644 --- a/tasks/create_security_group.yml +++ b/tasks/create_security_group.yml @@ -4,3 +4,4 @@ state: "{{ item_security_group.state|default(omit) }}" name: "{{ item_security_group.name }}" description: "{{ item_security_group.description|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_security_group_rule.yml b/tasks/create_security_group_rule.yml index b6f8314..4040c9f 100644 --- a/tasks/create_security_group_rule.yml +++ b/tasks/create_security_group_rule.yml @@ -10,3 +10,4 @@ protocol: "{{ item_security_group_rule.protocol|default(omit) }}" remote_group: "{{ item_security_group_rule.remote_group|default(omit) }}" remote_ip_prefix: "{{ item_security_group_rule.remote_ip_prefix|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_server.yml b/tasks/create_server.yml index fe25270..2bc1590 100644 --- a/tasks/create_server.yml +++ b/tasks/create_server.yml @@ -28,6 +28,7 @@ userdata: "{{ item_server.userdata|default(omit) }}" volume_size: "{{ item_server.volume_size|default(omit) }}" volumes: "{{ item_server.volumes|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" with_sequence: start=1 end={{ item_server.node_count|default(1) }} format=%02x register: os_server_result diff --git a/tasks/create_subnet.yml b/tasks/create_subnet.yml index 45d5b2d..16bbaab 100644 --- a/tasks/create_subnet.yml +++ b/tasks/create_subnet.yml @@ -6,3 +6,4 @@ network_name: "{{ item_subnet.network_name|default(omit) }}" cidr: "{{ item_subnet.cidr }}" dns_nameservers: "{{ item_subnet.dns_nameservers|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_user.yml b/tasks/create_user.yml index c11e09e..186b205 100644 --- a/tasks/create_user.yml +++ b/tasks/create_user.yml @@ -7,3 +7,4 @@ email: "{{ item_user.email|default(omit) }}" domain: "{{ item_user.domain|default(omit) }}" default_project: "{{ item_user.default_project|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}" diff --git a/tasks/create_volume.yml b/tasks/create_volume.yml index 2cb9eac..41d0f66 100644 --- a/tasks/create_volume.yml +++ b/tasks/create_volume.yml @@ -9,3 +9,4 @@ key: "{{ item_volume.key|default(omit) }}" snapshot_id: "{{ item_volume.snapshot_id|default(omit) }}" volume_type: "{{ item_volume.volume_type|default(omit) }}" + region_name: "{{ item_cloud.region_name|default(omit) }}"