Add global endpoint_type_proto options

This allows you to set the endpoint-type protocol globally for all
services, e.g. internaluri can be http, and publicuri can be https.

You will no longer have to specify it per service, although those
settings already exist and have not changed.

This patch changes no functionality for existing installs or deployments
and the values are defaulted to be the same as before, but allows these
values to be adjusted on a per-endpoint type basis.

Change-Id: I4854216726491f6ea4e265694e702f980fddc5a6
Closes-Bug: #1399383

etc/openstack_deploy/user_group_vars.yml

@@ -64,13 +64,21 @@ memcached_listen: "{{ ansible_ssh_host }}"
 memcached_port: 11211
 memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansible_ssh_host'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"
 
+
 ## Region Name
 service_region: RegionOne
 
+
+## OpenStack global Endpoint Protos
+#openstack_service_publicuri_proto: http
+#openstack_service_adminuri_proto: http
+#openstack_service_internaluri_proto: http
+
+
 ## Nova
 nova_service_port: 8774
 nova_service_proto: http
-nova_service_adminuri_proto: "{{ nova_service_proto }}"
+nova_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(nova_service_proto) }}"
 nova_service_user_name: nova
 nova_service_project_name: service
 nova_service_project_domain_id: default
@@ -85,7 +93,7 @@ nova_keystone_auth_plugin: password
 ## Neutron
 neutron_service_port: 9696
 neutron_service_proto: http
-neutron_service_adminuri_proto: "{{ neutron_service_proto }}"
+neutron_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(neutron_service_proto) }}"
 neutron_service_user_name: neutron
 neutron_service_project_name: service
 neutron_service_project_domain_id: default
@@ -104,7 +112,7 @@ neutron_service_metering_program_enabled: true
 ## Glance
 glance_service_port: 9292
 glance_service_proto: http
-glance_service_adminuri_proto: "{{ glance_service_proto }}"
+glance_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(glance_service_proto) }}"
 glance_service_user_name: glance
 glance_service_project_name: service
 glance_service_project_domain_id: default
@@ -120,8 +128,8 @@ keystone_admin_tenant_name: admin
 keystone_admin_port: 35357
 keystone_service_port: 5000
 keystone_service_proto: http
-keystone_service_adminuri_proto: "{{ keystone_service_proto }}"
-keystone_service_internaluri_proto: "{{ keystone_service_proto }}"
+keystone_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(keystone_service_proto) }}"
+keystone_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(keystone_service_proto) }}"
 keystone_service_user_name: keystone
 keystone_service_tenant_name: service
 keystone_service_internaluri: "{{ keystone_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ keystone_service_port }}"

playbooks/roles/os_cinder/defaults/main.yml

@@ -56,9 +56,9 @@ cinder_service_region: RegionOne
 cinder_service_description: "Cinder Volume Service"
 cinder_service_port: 8776
 cinder_service_proto: http
-cinder_service_publicuri_proto: "{{ cinder_service_proto }}"
-cinder_service_adminuri_proto: "{{ cinder_service_proto }}"
-cinder_service_internaluri_proto: "{{ cinder_service_proto }}"
+cinder_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(cinder_service_proto) }}"
+cinder_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(cinder_service_proto) }}"
+cinder_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(cinder_service_proto) }}"
 cinder_service_type: volume
 cinder_service_publicuri: "{{ cinder_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ cinder_service_port }}"
 cinder_service_publicurl: "{{ cinder_service_publicuri }}/v1/%(tenant_id)s"

playbooks/roles/os_glance/defaults/main.yml

@@ -60,9 +60,10 @@ glance_service_region: RegionOne
 glance_service_name: glance
 glance_service_port: 9292
 glance_service_proto: http
-glance_service_publicuri_proto: "{{ glance_service_proto }}"
-glance_service_adminuri_proto: "{{ glance_service_proto }}"
-glance_service_internaluri_proto: "{{ glance_service_proto }}"
+glance_service_registry_proto: "{{ glance_service_proto }}"
+glance_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(glance_service_proto) }}"
+glance_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(glance_service_proto) }}"
+glance_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(glance_service_proto) }}"
 glance_service_type: image
 glance_service_description: "Glance Image Service"
 glance_service_user_name: glance

playbooks/roles/os_glance/templates/glance-api.conf.j2

@@ -17,7 +17,7 @@ backlog = 4096
 workers = {{ glance_api_workers | default(api_threads) }}
 registry_host = {{ glance_registry_host }}
 registry_port = {{ glance_registry_service_port }}
-registry_client_protocol = {{ glance_service_proto }}
+registry_client_protocol = {{ glance_service_registry_proto }}
 cinder_catalog_info = volume:cinder:internalURL
 
 enable_v1_api = {{ glance_enable_v1_api }}

playbooks/roles/os_heat/defaults/main.yml

@@ -79,9 +79,9 @@ heat_service_region: RegionOne
 heat_service_description: "Heat Orchestration Service"
 heat_service_port: 8004
 heat_service_proto: http
-heat_service_publicuri_proto: "{{ heat_service_proto }}"
-heat_service_adminuri_proto: "{{ heat_service_proto }}"
-heat_service_internaluri_proto: "{{ heat_service_proto }}"
+heat_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(heat_service_proto) }}"
+heat_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(heat_service_proto) }}"
+heat_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(heat_service_proto) }}"
 heat_service_type: orchestration
 heat_service_publicuri: "{{ heat_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ heat_service_port }}"
 heat_service_publicurl: "{{ heat_service_publicuri }}/v1/%(tenant_id)s"
@@ -91,19 +91,14 @@ heat_service_internaluri: "{{ heat_service_internaluri_proto }}://{{ internal_lb
 heat_service_internalurl: "{{ heat_service_internaluri }}/v1/%(tenant_id)s"
 heat_service_program_name: heat-api
 
-## Heat wait and metadata server
-heat_waitcondition_server_uri: "{{ heat_cfn_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ heat_cfn_service_port }}"
-heat_waitcondition_server_url: "{{ heat_waitcondition_server_uri }}/v1/waitcondition"
-heat_metadata_server_url: "{{ heat_cfn_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ heat_cfn_service_port }}"
-
 ## Heat api cfn service type and data
 heat_cfn_service_name: heat-cfn
 heat_cfn_service_description: "Heat CloudFormation Service"
 heat_cfn_service_port: 8000
 heat_cfn_service_proto: http
-heat_cfn_service_publicuri_proto: "{{ heat_cfn_service_proto }}"
-heat_cfn_service_adminuri_proto: "{{ heat_cfn_service_proto }}"
-heat_cfn_service_internaluri_proto: "{{ heat_cfn_service_proto }}"
+heat_cfn_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(heat_cfn_service_proto) }}"
+heat_cfn_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(heat_cfn_service_proto) }}"
+heat_cfn_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(heat_cfn_service_proto) }}"
 heat_cfn_service_type: cloudformation
 heat_cfn_service_publicuri: "{{ heat_cfn_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ heat_cfn_service_port }}"
 heat_cfn_service_publicurl: "{{ heat_cfn_service_publicuri }}/v1"
@@ -113,6 +108,11 @@ heat_cfn_service_internaluri: "{{ heat_cfn_service_internaluri_proto }}://{{ int
 heat_cfn_service_internalurl: "{{ heat_cfn_service_internaluri }}/v1"
 heat_cfn_service_program_name: heat-api-cfn
 
+## Heat wait and metadata server
+heat_waitcondition_server_uri: "{{ heat_cfn_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ heat_cfn_service_port }}"
+heat_waitcondition_server_url: "{{ heat_waitcondition_server_uri }}/v1/waitcondition"
+heat_metadata_server_url: "{{ heat_cfn_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ heat_cfn_service_port }}"
+
 ## Heat cloudwatch
 heat_cloudwatch_program_name: heat-api-cloudwatch
 heat_engine_program_name: heat-engine

playbooks/roles/os_keystone/defaults/main.yml

@@ -85,9 +85,9 @@ keystone_service_region: RegionOne
 keystone_service_name: keystone
 keystone_service_port: 5000
 keystone_service_proto: http
-keystone_service_publicuri_proto: "{{ keystone_service_proto }}"
-keystone_service_adminuri_proto: "{{ keystone_service_proto }}"
-keystone_service_internaluri_proto: "{{ keystone_service_proto }}"
+keystone_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(keystone_service_proto) }}"
+keystone_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(keystone_service_proto) }}"
+keystone_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(keystone_service_proto) }}"
 keystone_service_type: identity
 keystone_service_description: "Keystone Identity Service"
 keystone_service_user_name: keystone

playbooks/roles/os_neutron/defaults/main.yml

@@ -85,9 +85,9 @@ neutron_service_type: network
 neutron_service_description: "OpenStack Networking"
 neutron_service_port: 9696
 neutron_service_proto: http
-neutron_service_publicuri_proto: "{{ neutron_service_proto }}"
-neutron_service_adminuri_proto: "{{ neutron_service_proto }}"
-neutron_service_internaluri_proto: "{{ neutron_service_proto }}"
+neutron_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(neutron_service_proto) }}"
+neutron_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(neutron_service_proto) }}"
+neutron_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(neutron_service_proto) }}"
 neutron_service_publicuri: "{{ neutron_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ neutron_service_port }}"
 neutron_service_publicurl: "{{ neutron_service_publicuri }}"
 neutron_service_adminuri: "{{ neutron_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ neutron_service_port }}"

playbooks/roles/os_nova/defaults/main.yml

@@ -59,9 +59,9 @@ nova_enabled_apis: "osapi_compute,metadata"
 nova_s3_service_name: s3
 nova_s3_service_type: s3
 nova_s3_service_proto: http
-nova_s3_service_publicuri_proto: "{{ nova_s3_service_proto }}"
-nova_s3_service_adminuri_proto: "{{ nova_s3_service_proto }}"
-nova_s3_service_internaluri_proto: "{{ nova_s3_service_proto }}"
+nova_s3_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(nova_s3_service_proto) }}"
+nova_s3_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(nova_s3_service_proto) }}"
+nova_s3_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(nova_s3_service_proto) }}"
 nova_s3_service_port: 3333
 nova_s3_service_description: "S3 Compatibility Layer"
 nova_s3_service_publicuri: "{{ nova_s3_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ nova_s3_service_port }}"
@@ -77,9 +77,9 @@ nova_s3_deprecated_but_enabled: false
 nova_v3_service_name: novav3
 nova_v3_service_type: computev3
 nova_v3_service_proto: http
-nova_v3_service_publicuri_proto: "{{ nova_v3_service_proto }}"
-nova_v3_service_adminuri_proto: "{{ nova_v3_service_proto }}"
-nova_v3_service_internaluri_proto: "{{ nova_v3_service_proto }}"
+nova_v3_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(nova_v3_service_proto) }}"
+nova_v3_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(nova_v3_service_proto) }}"
+nova_v3_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(nova_v3_service_proto) }}"
 nova_v3_service_port: 8774
 nova_v3_service_description: "Nova Compute Service V3"
 nova_v3_service_publicuri: "{{ nova_v3_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ nova_v3_service_port }}"
@@ -94,9 +94,9 @@ nova_v3_deprecated_but_enabled: false
 nova_v21_service_name: novav21
 nova_v21_service_type: computev21
 nova_v21_service_proto: http
-nova_v21_service_publicuri_proto: "{{ nova_v21_service_proto }}"
-nova_v21_service_adminuri_proto: "{{ nova_v21_service_proto }}"
-nova_v21_service_internaluri_proto: "{{ nova_v21_service_proto }}"
+nova_v21_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(nova_v21_service_proto) }}"
+nova_v21_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(nova_v21_service_proto) }}"
+nova_v21_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(nova_v21_service_proto) }}"
 nova_v21_service_port: 8774
 nova_v21_service_description: "Nova Compute Service V2.1"
 nova_v21_service_publicuri: "{{ nova_v21_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ nova_v21_service_port }}"
@@ -111,9 +111,9 @@ nova_v21_enabled: true
 nova_service_name: nova
 nova_service_type: compute
 nova_service_proto: http
-nova_service_publicuri_proto: "{{ nova_service_proto }}"
-nova_service_adminuri_proto: "{{ nova_service_proto }}"
-nova_service_internaluri_proto: "{{ nova_service_proto }}"
+nova_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(nova_service_proto) }}"
+nova_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(nova_service_proto) }}"
+nova_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(nova_service_proto) }}"
 nova_service_port: 8774
 nova_service_description: "Nova Compute Service"
 nova_service_publicuri: "{{ nova_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ nova_service_port }}"
@@ -130,9 +130,9 @@ nova_program_name: nova-api-os-compute
 nova_ec2_service_name: ec2
 nova_ec2_service_type: ec2
 nova_ec2_service_proto: http
-nova_ec2_service_publicuri_proto: "{{ nova_ec2_service_proto }}"
-nova_ec2_service_adminuri_proto: "{{ nova_ec2_service_proto }}"
-nova_ec2_service_internaluri_proto: "{{ nova_ec2_service_proto }}"
+nova_ec2_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(nova_ec2_service_proto) }}"
+nova_ec2_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(nova_ec2_service_proto) }}"
+nova_ec2_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(nova_ec2_service_proto) }}"
 nova_ec2_service_port: 8773
 nova_ec2_service_description: "EC2 Compatibility Layer"
 nova_ec2_service_publicuri: "{{ nova_ec2_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ nova_ec2_service_port }}"

playbooks/roles/os_swift/defaults/main.yml

@@ -46,9 +46,9 @@ swift_service_user_domain_id: "default"
 swift_service_role_name: "admin"
 swift_service_type: object-store
 swift_service_proto: http
-swift_service_publicuri_proto: "{{ swift_service_proto }}"
-swift_service_adminuri_proto: "{{ swift_service_proto }}"
-swift_service_internaluri_proto: "{{ swift_service_proto }}"
+swift_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(swift_service_proto) }}"
+swift_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(swift_service_proto) }}"
+swift_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(swift_service_proto) }}"
 swift_service_description: "Object Storage Service"
 swift_service_publicuri: "{{ swift_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ swift_proxy_port }}"
 swift_service_publicurl: "{{ swift_service_publicuri }}/v1/AUTH_%(tenant_id)s"