diff --git a/elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf b/elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf index 1063210d5..6b6cbbfd5 100644 --- a/elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf +++ b/elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf @@ -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}} diff --git a/elements/cinder/os-apply-config/etc/cinder/cinder.conf b/elements/cinder/os-apply-config/etc/cinder/cinder.conf index c5412cd39..57b0fbe06 100644 --- a/elements/cinder/os-apply-config/etc/cinder/cinder.conf +++ b/elements/cinder/os-apply-config/etc/cinder/cinder.conf @@ -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 diff --git a/elements/glance/os-apply-config/etc/glance/glance-api.conf b/elements/glance/os-apply-config/etc/glance/glance-api.conf index 7e5fa48de..8e51b15ba 100644 --- a/elements/glance/os-apply-config/etc/glance/glance-api.conf +++ b/elements/glance/os-apply-config/etc/glance/glance-api.conf @@ -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 diff --git a/elements/glance/os-apply-config/etc/glance/glance-registry.conf b/elements/glance/os-apply-config/etc/glance/glance-registry.conf index 065ade798..8570d36c2 100644 --- a/elements/glance/os-apply-config/etc/glance/glance-registry.conf +++ b/elements/glance/os-apply-config/etc/glance/glance-registry.conf @@ -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 diff --git a/elements/heat/os-apply-config/etc/heat/heat.conf b/elements/heat/os-apply-config/etc/heat/heat.conf index 8e9bf08c0..55973309d 100644 --- a/elements/heat/os-apply-config/etc/heat/heat.conf +++ b/elements/heat/os-apply-config/etc/heat/heat.conf @@ -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 diff --git a/elements/horizon/files/etc/httpd/conf.d/ports.conf b/elements/horizon/files/etc/httpd/conf.d/ports.conf index 8651718bb..d1d21c1da 100644 --- a/elements/horizon/files/etc/httpd/conf.d/ports.conf +++ b/elements/horizon/files/etc/httpd/conf.d/ports.conf @@ -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 diff --git a/elements/ironic/os-apply-config/etc/ironic/ironic.conf b/elements/ironic/os-apply-config/etc/ironic/ironic.conf index 542d5848e..c7fca9b95 100644 --- a/elements/ironic/os-apply-config/etc/ironic/ironic.conf +++ b/elements/ironic/os-apply-config/etc/ironic/ironic.conf @@ -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}} diff --git a/elements/keystone/os-apply-config/etc/keystone/keystone.conf b/elements/keystone/os-apply-config/etc/keystone/keystone.conf index 673e87290..2aa11a0bd 100644 --- a/elements/keystone/os-apply-config/etc/keystone/keystone.conf +++ b/elements/keystone/os-apply-config/etc/keystone/keystone.conf @@ -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] diff --git a/elements/neutron/os-apply-config/etc/neutron/neutron.conf b/elements/neutron/os-apply-config/etc/neutron/neutron.conf index 9afe5c22a..d7638ed31 100644 --- a/elements/neutron/os-apply-config/etc/neutron/neutron.conf +++ b/elements/neutron/os-apply-config/etc/neutron/neutron.conf @@ -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 diff --git a/elements/nova/os-apply-config/etc/nova/nova.conf b/elements/nova/os-apply-config/etc/nova/nova.conf index 4ff424eb2..ecb1dcff7 100644 --- a/elements/nova/os-apply-config/etc/nova/nova.conf +++ b/elements/nova/os-apply-config/etc/nova/nova.conf @@ -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}} @@ -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 diff --git a/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf b/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf index f024af1b9..60fb07bc0 100644 --- a/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf +++ b/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf @@ -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] diff --git a/elements/trove-api/os-apply-config/etc/trove/trove.conf b/elements/trove-api/os-apply-config/etc/trove/trove.conf index 1b2eef730..3449d13ac 100644 --- a/elements/trove-api/os-apply-config/etc/trove/trove.conf +++ b/elements/trove-api/os-apply-config/etc/trove/trove.conf @@ -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 @@ -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}}