summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka/roles
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-08-17 06:32:35 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-17 06:32:35 +0000
commit5f0d427554e95cffd27b15861df604abf7f709d9 (patch)
tree32d285358bdd8ee1135db5fe78737a3f681a5311 /deploy/adapters/ansible/openstack_mitaka/roles
parent5a17b6292e641cae7d939950fc5b3426bbcc0af9 (diff)
parentcb08cf5a6af418159b93a280deaec2a2964d5416 (diff)
Merge "rename region name to be unified"
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka/roles')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j22
-rw-r--r--deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml20
2 files changed, 11 insertions, 11 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2
index 743099cb..d4d232be 100644
--- a/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2
@@ -40,7 +40,7 @@ os_username = aodh
os_tenant_name = service
os_password = {{ AODH_PASS }}
os_endpoint_type = internalURL
-os_region_name = regionOne
+os_region_name = RegionOne
[api]
host = {{ internal_ip }}
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml
index 58751dfd..9e97a29c 100644
--- a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml
@@ -14,7 +14,7 @@ services_noarch: []
os_services:
- name: keystone
type: identity
- region: regionOne
+ region: RegionOne
description: "OpenStack Identity"
publicurl: "http://{{ public_vip.ip }}:5000/v2.0"
internalurl: "http://{{ internal_vip.ip }}:5000/v2.0"
@@ -22,7 +22,7 @@ os_services:
- name: glance
type: image
- region: regionOne
+ region: RegionOne
description: "OpenStack Image Service"
publicurl: "http://{{ public_vip.ip }}:9292"
internalurl: "http://{{ internal_vip.ip }}:9292"
@@ -30,7 +30,7 @@ os_services:
- name: nova
type: compute
- region: regionOne
+ region: RegionOne
description: "OpenStack Compute"
publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s"
internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s"
@@ -38,7 +38,7 @@ os_services:
- name: neutron
type: network
- region: regionOne
+ region: RegionOne
description: "OpenStack Networking"
publicurl: "http://{{ public_vip.ip }}:9696"
internalurl: "http://{{ internal_vip.ip }}:9696"
@@ -46,7 +46,7 @@ os_services:
- name: ceilometer
type: metering
- region: regionOne
+ region: RegionOne
description: "OpenStack Telemetry"
publicurl: "http://{{ public_vip.ip }}:8777"
internalurl: "http://{{ internal_vip.ip }}:8777"
@@ -54,7 +54,7 @@ os_services:
- name: aodh
type: alarming
- region: regionOne
+ region: RegionOne
description: "OpenStack Telemetry"
publicurl: "http://{{ public_vip.ip }}:8042"
internalurl: "http://{{ internal_vip.ip }}:8042"
@@ -62,7 +62,7 @@ os_services:
- name: cinder
type: volume
- region: regionOne
+ region: RegionOne
description: "OpenStack Block Storage"
publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s"
internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s"
@@ -70,7 +70,7 @@ os_services:
- name: cinderv2
type: volumev2
- region: regionOne
+ region: RegionOne
description: "OpenStack Block Storage v2"
publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s"
internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s"
@@ -78,7 +78,7 @@ os_services:
- name: heat
type: orchestration
- region: regionOne
+ region: RegionOne
description: "OpenStack Orchestration"
publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s"
internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s"
@@ -86,7 +86,7 @@ os_services:
- name: heat-cfn
type: cloudformation
- region: regionOne
+ region: RegionOne
description: "OpenStack CloudFormation Orchestration"
publicurl: "http://{{ public_vip.ip }}:8000/v1"
internalurl: "http://{{ internal_vip.ip }}:8000/v1"