Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Check stunnel.connect_host not stunnel.connect_ip
Browse files Browse the repository at this point in the history 
The various service configurations all check for
stunnel.connect_ip as part of the configuration for
enabling stunnel. This variable doesn't exist in any
template. However stunnel.connect_host exists in
ssl_source.yaml

Change-Id: Iee4dd33d5afde211f669346005c36f88c9ebeae2
Depends-On: I25c4bb09cf28a3728e959d4dd583af26a602ad90
Closes-Bug: #1391926
  • Loading branch information
Nicholas Randon committed Nov 13, 2014
1 parent 85c807a commit dab509a
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 75 deletions.
10 changes: 5 additions & 5 deletions elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf
View file
Expand Up @@ -46,12 +46,12 @@ record_history=true

[api]
{{#haproxy}}
{{#stunnel.connect_ip}}
host = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
host = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
host = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}


Expand Down
10 changes: 5 additions & 5 deletions elements/cinder/os-apply-config/etc/cinder/cinder.conf
View file
Expand Up @@ -13,12 +13,12 @@ debug={{cinder.debug}}
{{/cinder.debug}}

{{#haproxy}}
{{#stunnel.connect_ip}}
osapi_volume_listen = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
osapi_volume_listen = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
osapi_volume_listen = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

state_path = /mnt/state/var/lib/cinder
Expand Down
12 changes: 6 additions & 6 deletions elements/glance/os-apply-config/etc/glance/glance-api.conf
View file
Expand Up @@ -56,14 +56,14 @@ log_file = {{glance.log-file}}
{{/glance.log-file}}

{{#haproxy}}
{{#stunnel.connect_ip}}
bind_host = {{stunnel.connect_ip}}
registry_host = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
bind_host = {{stunnel.connect_host}}
registry_host = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
bind_host = {{local-ipv4}}
registry_host = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}
bind_port = 9292

Expand Down
10 changes: 5 additions & 5 deletions elements/glance/os-apply-config/etc/glance/glance-registry.conf
View file
Expand Up @@ -30,12 +30,12 @@ default_log_levels = {{glance.registry.default-log-levels}}
{{/glance.registry.default-log-levels}}

{{#haproxy}}
{{#stunnel.connect_ip}}
bind_host = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
bind_host = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
bind_host = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}
bind_port = 9191

Expand Down
10 changes: 5 additions & 5 deletions elements/heat/os-apply-config/etc/heat/heat.conf
View file
Expand Up @@ -18,12 +18,12 @@ debug={{heat.debug}}
# particular network interface. (string value)
#bind_host=0.0.0.0
{{#haproxy}}
{{#stunnel.connect_ip}}
bind_host = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
bind_host = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
bind_host = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

# The SQLAlchemy connection string used to connect to the
Expand Down
10 changes: 5 additions & 5 deletions elements/horizon/files/etc/httpd/conf.d/ports.conf
View file
@@ -1,11 +1,11 @@
NameVirtualHost *:80
{{#haproxy}}
{{#stunnel.connect_ip}}
Listen {{stunnel.connect_ip}}:80
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
Listen {{stunnel.connect_host}}:80
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
Listen {{local-ipv4}}:80
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}
{{^haproxy}}
Listen 80
Expand Down
10 changes: 5 additions & 5 deletions elements/ironic/os-apply-config/etc/ironic/ironic.conf
View file
Expand Up @@ -2,12 +2,12 @@
{{#ironic.debug}}debug=True{{/ironic.debug}}
{{#ironic.verbose}}verbose=True{{/ironic.verbose}}
{{#haproxy}}
{{#stunnel.connect_ip}}
host_ip = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
host_ip = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
host_ip = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

{{#rabbit}}
Expand Down
12 changes: 6 additions & 6 deletions elements/keystone/os-apply-config/etc/keystone/keystone.conf
View file
Expand Up @@ -12,14 +12,14 @@ debug={{keystone.debug}}
{{/keystone.debug}}

{{#haproxy}}
{{#stunnel.connect_ip}}
public_bind_host = {{stunnel.connect_ip}}
admin_bind_host = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
public_bind_host = {{stunnel.connect_host}}
admin_bind_host = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
public_bind_host = {{local-ipv4}}
admin_bind_host = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

[sql]
Expand Down
10 changes: 5 additions & 5 deletions elements/neutron/os-apply-config/etc/neutron/neutron.conf
View file
Expand Up @@ -50,12 +50,12 @@ rpc_backend = neutron.openstack.common.rpc.impl_qpid
{{/qpid}}

{{#haproxy}}
{{#stunnel.connect_ip}}
bind_host = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
bind_host = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
bind_host = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

bind_port = 9696
Expand Down
32 changes: 16 additions & 16 deletions elements/nova/os-apply-config/etc/nova/nova.conf
View file
Expand Up @@ -31,16 +31,16 @@ ec2_url=http://{{nova.host}}:8773/services/Cloud
my_ip={{local-ipv4}}
{{/local-ipv4}}
{{#haproxy}}
{{#stunnel.connect_ip}}
osapi_compute_listen={{stunnel.connect_ip}}
ec2_listen={{stunnel.connect_ip}}
metadata_listen={{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
osapi_compute_listen={{stunnel.connect_host}}
ec2_listen={{stunnel.connect_host}}
metadata_listen={{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
osapi_compute_listen={{local-ipv4}}
ec2_listen={{local-ipv4}}
metadata_listen={{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

{{#nova.default_ephemeral_format}}
Expand All @@ -59,21 +59,21 @@ keystone_ec2_url=http://{{keystone.host}}:5000/v2.0/ec2tokens

# VNC configuration
{{#nova.public_ip}}
{{#stunnel.connect_ip}}
{{#stunnel.connect_host}}
novncproxy_base_url=https://{{nova.public_ip}}:6080/vnc_auto.html
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
novncproxy_base_url=http://{{nova.public_ip}}:6080/vnc_auto.html
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/nova.public_ip}}
novncproxy_port=6080
{{#haproxy}}
{{#stunnel.connect_ip}}
novncproxy_host={{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
novncproxy_host={{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
novncproxy_host={{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}
vncserver_proxyclient_address={{local-ipv4}}
vncserver_listen=0.0.0.0
Expand Down
10 changes: 5 additions & 5 deletions elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf
View file
@@ -1,12 +1,12 @@
[DEFAULT]
bind_port = 8080
{{#haproxy}}
{{#stunnel.connect_ip}}
bind_ip = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
bind_ip = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
bind_ip = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

[pipeline:main]
Expand Down
14 changes: 7 additions & 7 deletions elements/trove-api/os-apply-config/etc/trove/trove.conf
View file
Expand Up @@ -11,18 +11,18 @@ debug = {{trove.debug}}
{{/trove.debug}}

{{#haproxy}}
{{#stunnel.connect_ip}}
bind_host = {{stunnel.connect_ip}}
{{/stunnel.connect_ip}}
{{^stunnel.connect_ip}}
{{#stunnel.connect_host}}
bind_host = {{stunnel.connect_host}}
{{/stunnel.connect_host}}
{{^stunnel.connect_host}}
bind_host = {{local-ipv4}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

# TODO: host/port settings should be done in the same way as for other
# services, leaving it here for now to not break current behavior
{{^haproxy}}
{{^stunnel.connect_ip}}
{{^stunnel.connect_host}}
{{#trove.bind_host}}
# Address to bind the API server
bind_host = 0.0.0.0
Expand All @@ -32,7 +32,7 @@ bind_host = 0.0.0.0
# Port the bind the API server to
bind_port = {{trove.bind_port}}
{{/trove.bind_port}}
{{/stunnel.connect_ip}}
{{/stunnel.connect_host}}
{{/haproxy}}

{{#trove.api_workers}}
Expand Down

0 comments on commit dab509a

Please sign in to comment.