From cb08cf5a6af418159b93a280deaec2a2964d5416 Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Mon, 15 Aug 2016 05:58:38 -0400 Subject: 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 --- .../ansible/openstack/templates/neutron.conf | 2 +- .../roles/aodh/templates/aodh.conf.j2 | 2 +- .../openstack_mitaka/roles/keystone/vars/main.yml | 20 ++++++++++---------- .../openstack_mitaka/templates/neutron.conf | 2 +- .../roles/aodh/templates/aodh.conf.j2 | 2 +- .../roles/keystone/vars/main.yml | 22 +++++++++++----------- .../roles/moon/vars/main.yml | 22 +++++++++++----------- .../openstack_mitaka_xenial/templates/neutron.conf | 2 +- .../ceilometer_compute/templates/ceilometer.j2 | 2 +- .../ceilometer_controller/templates/ceilometer.j2 | 2 +- .../adapters/ansible/roles/keystone/vars/main.yml | 18 +++++++++--------- .../neutron-compute/templates/metadata_agent.ini | 2 +- .../templates/metadata_agent.ini | 2 +- .../neutron-network/templates/metadata_agent.ini | 2 +- .../nova-controller/templates/metadata_agent.ini | 2 +- .../roles/tacker/tasks/tacker_controller.yml | 2 +- 16 files changed, 53 insertions(+), 53 deletions(-) diff --git a/deploy/adapters/ansible/openstack/templates/neutron.conf b/deploy/adapters/ansible/openstack/templates/neutron.conf index ebc46f99..cbdd534d 100644 --- a/deploy/adapters/ansible/openstack/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack/templates/neutron.conf @@ -307,7 +307,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova 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" diff --git a/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf b/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf index 5e33d3f7..33231ed5 100644 --- a/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf @@ -310,7 +310,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 index 743099cb..d4d232be 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/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_xenial/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml index 7a09378c..9ce499da 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/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" @@ -94,7 +94,7 @@ os_services: - name: swift type: object-store - region: regionOne + region: RegionOne description: "OpenStack Object Storage" publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml index 9db404b9..aad55d05 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/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" @@ -94,7 +94,7 @@ os_services: - name: swift type: object-store - region: regionOne + region: RegionOne description: "OpenStack Object Storage" publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf b/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf index 5e33d3f7..33231ed5 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf @@ -310,7 +310,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova 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 -- cgit 1.2.3-korg