Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
added ssl support based on default.
[joid.git]
/
ci
/
config_tpl
/
juju2
/
bundle_tpl
/
nova-cloud-controller.yaml
diff --git
a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
index
bfb4c27
..
a31db8a
100644
(file)
--- a/
ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/
ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@
-25,7
+25,15
@@
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% if os.ha.mode == 'ha' %}
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% if os.ha.mode == 'ha' %}
- vip: {{ opnfv.vip.nova }}
+ vip: *nova-cc-vip
+{% endif %}
+{% if os.api.ssl %}
+ ssl_ca: *ssl_ca
+ ssl_cert: *ssl_cert
+ ssl_key: *ssl_key
+ os-public-hostname: *hostname_nova_public
+ os-internal-hostname: *hostname_nova_public
+ os-admin-hostname: *hostname_nova_public
{% endif %}
{% if opnfv.domain is defined %}
#console-proxy-ip: {{ opnfv.domain }}
{% endif %}
{% if opnfv.domain is defined %}
#console-proxy-ip: {{ opnfv.domain }}