Centralize setting internal_protocol
Internal Openstack APIs may be encrypted with https. This patch
centralize setting internal API protocol among services by
setting one of depending if cluster or single models are used:
cluster_internal_protocol: 'https'
internal_protocol: 'https'
Change-Id: I2baff79cd5851678559d7de47460fdd2031f70ee
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index f583156..be5f775 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -11,6 +11,7 @@
nova_ram_allocation_ratio: 1.5
nova_disk_allocation_ratio: 1.0
metadata_password: metadataPass
+ cluster_internal_protocol: 'http'
linux:
system:
package:
@@ -50,6 +51,7 @@
user: nova
password: ${_param:keystone_nova_password}
tenant: service
+ protocol: ${_param:cluster_internal_protocol}
message_queue:
engine: rabbitmq
port: 5672
@@ -63,6 +65,7 @@
glance:
host: ${_param:cluster_vip_address}
port: 9292
+ protocol: ${_param:cluster_internal_protocol}
network:
engine: neutron
region: ${_param:openstack_region}
@@ -72,5 +75,6 @@
port: 9696
mtu: 1500
tenant: service
+ protocol: ${_param:cluster_internal_protocol}
metadata:
password: ${_param:metadata_password}
diff --git a/nova/control/single.yml b/nova/control/single.yml
index c2aef10..ca21d05 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -1,6 +1,8 @@
classes:
- service.nova.control.single
parameters:
+ _param:
+ cluster_internal_protocol: 'http'
linux:
system:
package:
@@ -11,3 +13,9 @@
controller:
database:
host: ${_param:single_address}
+ identity:
+ protocol: ${_param:cluster_internal_protocol}
+ network:
+ protocol: ${_param:cluster_internal_protocol}
+ glance:
+ protocol: ${_param:cluster_internal_protocol}