summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaisonneau <david.blaisonneau@orange.com>2016-07-20 16:49:51 +0200
committerDavid Blaisonneau <david.blaisonneau@orange.com>2016-07-20 16:55:37 +0200
commitf37156cfdbc1ebf28e01660de79b48b21eb2864a (patch)
treecdb7f85baef8e2737534c0bc819f4210c044577d
parentc23433f96744362555b245592a958daf67e063ad (diff)
JOID: move os-public-hostname from overrides to endpoints config
this change is needed for congress. It will works on admin interfaces. Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
-rw-r--r--ci/bundle_tpl/ceilometer.yaml3
-rw-r--r--ci/bundle_tpl/cinder.yaml3
-rw-r--r--ci/bundle_tpl/glance.yaml3
-rw-r--r--ci/bundle_tpl/heat.yaml3
-rw-r--r--ci/bundle_tpl/keystone.yaml3
-rw-r--r--ci/bundle_tpl/neutron-api.yaml3
-rw-r--r--ci/bundle_tpl/nova-cloud-controller.yaml3
-rw-r--r--ci/bundle_tpl/phase2-overrides.yaml3
8 files changed, 21 insertions, 3 deletions
diff --git a/ci/bundle_tpl/ceilometer.yaml b/ci/bundle_tpl/ceilometer.yaml
index 125e8382..ef5d9b4c 100644
--- a/ci/bundle_tpl/ceilometer.yaml
+++ b/ci/bundle_tpl/ceilometer.yaml
@@ -9,6 +9,9 @@
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.ceilometer }}
{% endif %}
+{% if os.beta.public_api %}
+ os-public-hostname: api.{{ opnfv.domain }}
+{% endif %}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/bundle_tpl/cinder.yaml b/ci/bundle_tpl/cinder.yaml
index d28ecd76..4c1b8623 100644
--- a/ci/bundle_tpl/cinder.yaml
+++ b/ci/bundle_tpl/cinder.yaml
@@ -2,6 +2,9 @@
charm: "local:{{ ubuntu.release }}/cinder"
num_units: {{ unit_qty() }}
options:
+{% if os.beta.public_api %}
+ os-public-hostname: api.{{ opnfv.domain }}
+{% endif %}
block-device: None
glance-api-version: 2
{% if os.ha.mode == 'ha' %}
diff --git a/ci/bundle_tpl/glance.yaml b/ci/bundle_tpl/glance.yaml
index f4fcbf00..84999326 100644
--- a/ci/bundle_tpl/glance.yaml
+++ b/ci/bundle_tpl/glance.yaml
@@ -5,6 +5,9 @@
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.glance }}
{% endif %}
+{% if os.beta.public_api %}
+ os-public-hostname: api.{{ opnfv.domain }}
+{% endif %}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/bundle_tpl/heat.yaml b/ci/bundle_tpl/heat.yaml
index ba97fb61..5f8be0a2 100644
--- a/ci/bundle_tpl/heat.yaml
+++ b/ci/bundle_tpl/heat.yaml
@@ -5,6 +5,9 @@
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.heat }}
{% endif %}
+{% if os.beta.public_api %}
+ os-public-hostname: api.{{ opnfv.domain }}
+{% endif %}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/bundle_tpl/keystone.yaml b/ci/bundle_tpl/keystone.yaml
index 147bdc3f..24f5b102 100644
--- a/ci/bundle_tpl/keystone.yaml
+++ b/ci/bundle_tpl/keystone.yaml
@@ -7,6 +7,9 @@
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.keystone }}
{% endif %}
+{% if os.beta.public_api %}
+ os-public-hostname: api.{{ opnfv.domain }}
+{% endif %}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/bundle_tpl/neutron-api.yaml b/ci/bundle_tpl/neutron-api.yaml
index 88990cb3..053b6ffa 100644
--- a/ci/bundle_tpl/neutron-api.yaml
+++ b/ci/bundle_tpl/neutron-api.yaml
@@ -15,6 +15,9 @@
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.neutron }}
{% endif %}
+{% if os.beta.public_api %}
+ os-public-hostname: api.{{ opnfv.domain }}
+{% endif %}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/bundle_tpl/nova-cloud-controller.yaml b/ci/bundle_tpl/nova-cloud-controller.yaml
index 1dfc47ec..bdf1090a 100644
--- a/ci/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/bundle_tpl/nova-cloud-controller.yaml
@@ -12,6 +12,9 @@
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.nova }}
{% endif %}
+{% if os.beta.public_api %}
+ os-public-hostname: api.{{ opnfv.domain }}
+{% endif %}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
diff --git a/ci/bundle_tpl/phase2-overrides.yaml b/ci/bundle_tpl/phase2-overrides.yaml
index 218df213..dd44ab56 100644
--- a/ci/bundle_tpl/phase2-overrides.yaml
+++ b/ci/bundle_tpl/phase2-overrides.yaml
@@ -25,7 +25,4 @@
keystone-admin-role: {{ os.admin.role }}
{% if os.beta.public_api %}
use-internal-endpoints: true
-{% if opnfv.domain is defined %}
- os-public-hostname: api.{{ opnfv.domain }}
-{% endif %}
{% endif %}