summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-08-15 05:58:38 -0400
committerMatthewLi <matthew.lijun@huawei.com>2016-08-15 06:00:32 -0400
commitcb08cf5a6af418159b93a280deaec2a2964d5416 (patch)
tree6b3d43b6cc22cc96357c0af798a88a4515e8b58b /deploy/adapters/ansible/roles
parent865e211e752f0de17d560da3c4641c1e3d9af8bb (diff)
rename region name to be unified
JIRA: COMPASS-457 nova region name should be unified. compass use regionOne original, however, upstream usually use RegionOne, this is caused by clerical error. Now the OCL and sfc/tacker use RegionOne by not knowing the compass clerical error. so all should be changed to RegionOne. Change-Id: I8bc280cca036afffe09d0a3bcebc940deaa490b5 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles')
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j22
-rw-r--r--deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j22
-rw-r--r--deploy/adapters/ansible/roles/keystone/vars/main.yml18
-rw-r--r--deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini2
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini2
-rw-r--r--deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini2
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini2
-rwxr-xr-xdeploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml2
8 files changed, 16 insertions, 16 deletions
diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2
index ee78de01..275c991a 100644
--- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2
@@ -27,5 +27,5 @@ os_username = ceilometer
os_tenant_name = service
os_password = {{ CEILOMETER_PASS }}
os_endpoint_type = internalURL
-os_region_name = regionOne
+os_region_name = RegionOne
diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
index b262a26b..d0cadeaa 100644
--- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
+++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2
@@ -28,7 +28,7 @@ os_username = ceilometer
os_tenant_name = service
os_password = {{ CEILOMETER_PASS }}
os_endpoint_type = internalURL
-os_region_name = regionOne
+os_region_name = RegionOne
[publisher]
metering_secret = {{ metering_secret }}
diff --git a/deploy/adapters/ansible/roles/keystone/vars/main.yml b/deploy/adapters/ansible/roles/keystone/vars/main.yml
index 9a7312e9..c6725da6 100644
--- a/deploy/adapters/ansible/roles/keystone/vars/main.yml
+++ b/deploy/adapters/ansible/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: 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"
@@ -62,7 +62,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"
@@ -70,7 +70,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"
@@ -78,7 +78,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"
diff --git a/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini
index 87937cc7..5109d8b7 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini
+++ b/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini
@@ -4,7 +4,7 @@ debug = True
# The Neutron user information for accessing the Neutron API.
auth_url = http://{{ internal_vip.ip }}:5000/v2.0
-auth_region = regionOne
+auth_region = RegionOne
# Turn off verification of the certificate for ssl
# auth_insecure = False
# Certificate Authority public key (CA cert) file for ssl
diff --git a/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini
index 87937cc7..5109d8b7 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini
+++ b/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini
@@ -4,7 +4,7 @@ debug = True
# The Neutron user information for accessing the Neutron API.
auth_url = http://{{ internal_vip.ip }}:5000/v2.0
-auth_region = regionOne
+auth_region = RegionOne
# Turn off verification of the certificate for ssl
# auth_insecure = False
# Certificate Authority public key (CA cert) file for ssl
diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini
index 87937cc7..5109d8b7 100644
--- a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini
+++ b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini
@@ -4,7 +4,7 @@ debug = True
# The Neutron user information for accessing the Neutron API.
auth_url = http://{{ internal_vip.ip }}:5000/v2.0
-auth_region = regionOne
+auth_region = RegionOne
# Turn off verification of the certificate for ssl
# auth_insecure = False
# Certificate Authority public key (CA cert) file for ssl
diff --git a/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini
index 87937cc7..5109d8b7 100644
--- a/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini
+++ b/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini
@@ -4,7 +4,7 @@ debug = True
# The Neutron user information for accessing the Neutron API.
auth_url = http://{{ internal_vip.ip }}:5000/v2.0
-auth_region = regionOne
+auth_region = RegionOne
# Turn off verification of the certificate for ssl
# auth_insecure = False
# Certificate Authority public key (CA cert) file for ssl
diff --git a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml
index 35f896dc..564b5506 100755
--- a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml
+++ b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml
@@ -76,7 +76,7 @@
- name: provide an endpoint to tacker service
shell: >
- . /opt/admin-openrc.sh; openstack endpoint create --region regionOne \
+ . /opt/admin-openrc.sh; openstack endpoint create --region RegionOne \
--publicurl 'http://{{ public_vip.ip }}:8888/' \
--adminurl 'http://{{ internal_vip.ip }}:8888/' \
--internalurl 'http://{{ internal_vip.ip }}:8888/' tacker