From dce9b446825d4d90f145424a9d7079ba8f3b649b Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 15 Aug 2017 21:19:07 -0500 Subject: modfied to use the default internal endpoint. Change-Id: Iff2b0feacd6597d7dd7d6f6037dfa135bb0a6704 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 1 + ci/config_tpl/juju2/bundle_tpl/cinder.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/glance.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | 4 +--- 7 files changed, 2 insertions(+), 13 deletions(-) (limited to 'ci/config_tpl/juju2/bundle_tpl') diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 0d4866d7..87591a42 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -6,6 +6,7 @@ bindings: "": *oam-space public: *ceph-public-space + cluster: *ceph-cluster-space {% endif %} options: monitor-count: {{ unit_ceph_qty() }} diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml index 28b72227..027fc045 100644 --- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml @@ -21,9 +21,7 @@ region: *openstack-region block-device: None glance-api-version: 2 -{% if os.beta.public_api %} use-internal-endpoints: True -{% endif %} {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml index d1136446..198cefb7 100644 --- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml @@ -13,9 +13,7 @@ openstack-origin: *openstack-origin worker-multiplier: *worker-multiplier region: *openstack-region -{% if os.beta.public_api %} use-internal-endpoints: True -{% endif %} {% if os.git_repo.origin_git %} openstack-origin-git: "{{ os.git_repo.branch }}" {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index 59d83c54..d3b3be5b 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml @@ -16,9 +16,7 @@ {% endif %} region: *openstack-region neutron-security-groups: true -{% if os.beta.public_api %} use-internal-endpoints: True -{% endif %} worker-multiplier: *worker-multiplier {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} 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 04ac2884..1c373b92 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml @@ -21,9 +21,7 @@ worker-multiplier: *worker-multiplier single-nova-consoleauth: False network-manager: Neutron -{% if os.beta.public_api %} use-internal-endpoints: true -{% endif %} {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml index 88f4f382..fe3a7224 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml @@ -20,9 +20,7 @@ enable-live-migration: True enable-resize: True migration-auth-type: ssh -{% if os.beta.public_api %} use-internal-endpoints: True -{% endif %} {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml index b12f0a56..59469aef 100644 --- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml @@ -3,11 +3,9 @@ ceilometer-agent: charm: ./{{ ubuntu.release }}/ceilometer-agent options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" -{% if os.beta.public_api %} + openstack-origin: *openstack-origin use-internal-endpoints: true {% endif %} -{% endif %} {% if opnfv.storage_dict.ceph is defined %} cinder-ceph: charm: ./{{ ubuntu.release }}/cinder-ceph -- cgit 1.2.3-korg