From 906d4970a76a93fbfabae04fcd3eebb0845dd3a6 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Mon, 21 Aug 2017 09:31:10 +0200 Subject: [PATCH] Add OS_REGION_NAME to clouds.yaml RegionOne is not always true for OS_REGION_NAME. Change-Id: I22c66065570f83cd3b610210fc83c2cd6dcc5ac6 --- config/environments/rdocloud-ci.yml | 1 + config/environments/rdocloud.yml | 1 + roles/ovb-manage-stack/README.md | 1 + roles/ovb-manage-stack/defaults/main.yml | 1 + roles/ovb-manage-stack/templates/clouds.yaml.j2 | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/environments/rdocloud-ci.yml b/config/environments/rdocloud-ci.yml index 3cc21e87b..172712b4e 100644 --- a/config/environments/rdocloud-ci.yml +++ b/config/environments/rdocloud-ci.yml @@ -2,6 +2,7 @@ os_username: "{{ lookup('env','OS_USERNAME') }}" os_password: "{{ lookup('env','OS_PASSWORD') }}" os_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}" os_auth_url: "{{ lookup('env','OS_AUTH_URL') }}" +os_region_name: "{{ lookup('env','OS_REGION_NAME') }}" cloud_name: rdocloud latest_guest_image: diff --git a/config/environments/rdocloud.yml b/config/environments/rdocloud.yml index 93a471156..f5a1165b9 100644 --- a/config/environments/rdocloud.yml +++ b/config/environments/rdocloud.yml @@ -2,6 +2,7 @@ os_username: "{{ lookup('env','OS_USERNAME') }}" os_password: "{{ lookup('env','OS_PASSWORD') }}" os_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}" os_auth_url: "{{ lookup('env','OS_AUTH_URL') }}" +os_region_name: "{{ lookup('env', 'OS_REGION_NAME') }}" cloud_name: rdocloud latest_guest_image: diff --git a/roles/ovb-manage-stack/README.md b/roles/ovb-manage-stack/README.md index 6f4ff369a..7d046f4a0 100644 --- a/roles/ovb-manage-stack/README.md +++ b/roles/ovb-manage-stack/README.md @@ -19,6 +19,7 @@ To interact with the Openstack Virtual Baremetal host cloud, credentials are nee - os_password: - os_tenant_name: - os_auth_url: # For example http://190.1.1.5:5000/v2.0 +- os_region_name: # Most probably RegionOne Parameters required to access the stack: - prefix --used as in id for the image and the stack parameters diff --git a/roles/ovb-manage-stack/defaults/main.yml b/roles/ovb-manage-stack/defaults/main.yml index 48e52c4c1..38f01f940 100644 --- a/roles/ovb-manage-stack/defaults/main.yml +++ b/roles/ovb-manage-stack/defaults/main.yml @@ -14,6 +14,7 @@ os_username: admin os_password: password os_tenant_name: admin os_auth_url: 'http://10.0.1.10:5000/v2.0' +os_region_name: 'regionOne' cloud_name: qeos7 stack_name: 'oooq-{{ prefix }}stack' diff --git a/roles/ovb-manage-stack/templates/clouds.yaml.j2 b/roles/ovb-manage-stack/templates/clouds.yaml.j2 index bb1352067..0830292a8 100644 --- a/roles/ovb-manage-stack/templates/clouds.yaml.j2 +++ b/roles/ovb-manage-stack/templates/clouds.yaml.j2 @@ -5,5 +5,5 @@ clouds: password: {{ os_password }} project_name: {{ os_tenant_name }} auth_url: {{ os_auth_url }} - region_name: regionOne + region_name: {{ os_region_name }}