From c7410f20ae678809c9cf91af284f8c07deb4ead9 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 22 Aug 2017 11:05:41 -0500 Subject: removing the public gateway addition code as it was added because ealier juju was not supported with multiple network space. Change-Id: I9fc3017c90b8ecdf9a6a1563056dad37d995ca0e Signed-off-by: Narinder Gupta --- ci/config_tpl/deployconfig.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml | 3 --- ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 4 +--- ci/config_tpl/juju2/bundle_tpl/cinder.yaml | 4 ---- ci/config_tpl/juju2/bundle_tpl/glance.yaml | 4 ---- ci/config_tpl/juju2/bundle_tpl/heat.yaml | 3 --- ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 3 --- ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 4 ---- ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml | 4 ---- ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml | 1 - ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml | 3 --- ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | 1 - ci/config_tpl/juju2/deployconfig.yaml | 4 ---- ci/config_tpl/juju2/public-api-proxy.yaml | 14 -------------- ci/config_tpl/public-api-proxy.yaml | 14 -------------- 15 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 ci/config_tpl/juju2/public-api-proxy.yaml delete mode 100644 ci/config_tpl/public-api-proxy.yaml (limited to 'ci/config_tpl') diff --git a/ci/config_tpl/deployconfig.yaml b/ci/config_tpl/deployconfig.yaml index 8800f302..492c6606 100644 --- a/ci/config_tpl/deployconfig.yaml +++ b/ci/config_tpl/deployconfig.yaml @@ -15,12 +15,10 @@ opnfv: {% set netdata_prefix = opnfv.spaces_dict.data.cidr[:-4] %} dataNetwork: {{ opnfv.spaces_dict.data.cidr }} {% endif %} - domain: {{ lab.racks[0].osdomainname }} ext-port: {{ lab.racks[0]['ext-port'] }} ext_port: {{ lab.racks[0]['ext-port'] }} floating-ip-range: {{ lab.racks[0]['floating-ip-range'] }} interface-enable: {{ lab.racks[0].ifnamelist }} - os-domain-name: {{ lab.racks[0].osdomainname }} {% if opnfv.spaces_dict.public is defined %} {% set netpublic_prefix = opnfv.spaces_dict.public.cidr[:-4] %} publicNetwork: {{ opnfv.spaces_dict.public.cidr }} diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml index de6a1214..49bd4f7d 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml @@ -23,9 +23,6 @@ region: *openstack-region {% 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() %} diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 1b032ab8..0bd600aa 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -9,9 +9,7 @@ cluster: *ceph-cluster-space {% endif %} options: - monitor-count: {{ unit_ceph_qty() }} - fsid: ecbb8960-0e21-11e2-b495-83a88f44db01 - monitor-secret: AQD1P2xQiKglDhAA4NGUF5j38Mhq56qwz+45wg== + expceted-osd-count: {{ unit_ceph_qty() }} source: *openstack-origin {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml index 0313f07c..12b6acc6 100644 --- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml @@ -22,7 +22,6 @@ region: *openstack-region block-device: None glance-api-version: 2 - use-internal-endpoints: True {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} @@ -34,9 +33,6 @@ {% endif %} {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.cinder }} -{% endif %} -{% if os.beta.public_api %} - os-public-hostname: api.{{ opnfv.domain }} {% endif %} to: {% if opnfv.storage_dict.scaleio is defined %} diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml index 725c436e..e765bc30 100644 --- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml @@ -14,7 +14,6 @@ openstack-origin: *openstack-origin worker-multiplier: *worker-multiplier region: *openstack-region - use-internal-endpoints: True {% if os.git_repo.origin_git %} openstack-origin-git: "{{ os.git_repo.branch }}" {% endif %} @@ -26,9 +25,6 @@ {% endif %} {% 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() %} diff --git a/ci/config_tpl/juju2/bundle_tpl/heat.yaml b/ci/config_tpl/juju2/bundle_tpl/heat.yaml index e5e33605..175283ce 100644 --- a/ci/config_tpl/juju2/bundle_tpl/heat.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/heat.yaml @@ -18,9 +18,6 @@ worker-multiplier: *worker-multiplier {% if os.ha.mode == 'ha' %} # vip: {{ opnfv.vip.heat }} -{% endif %} -{% if os.beta.public_api %} -# os-public-hostname: api.{{ opnfv.domain }} {% endif %} to: - "lxd:nodes/0" diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml index 22912e68..1c6b78f6 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -28,9 +28,6 @@ admin-token: {{ os.admin.name }} {% 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() %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index d3b3be5b..e59530c1 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml @@ -16,7 +16,6 @@ {% endif %} region: *openstack-region neutron-security-groups: true - use-internal-endpoints: True worker-multiplier: *worker-multiplier {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} @@ -39,9 +38,6 @@ flat-network-providers: physnet1 manage-neutron-plugin-legacy-mode: False {% endif %} -{% if os.beta.public_api %} - os-public-hostname: api.{{ opnfv.domain }} -{% endif %} {% if os.network.dvr %} enable-dvr: true {% endif %} 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 1c373b92..bfb4c27d 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml @@ -21,7 +21,6 @@ worker-multiplier: *worker-multiplier single-nova-consoleauth: False network-manager: Neutron - use-internal-endpoints: true {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} @@ -30,9 +29,6 @@ {% endif %} {% if opnfv.domain is defined %} #console-proxy-ip: {{ opnfv.domain }} -{% endif %} -{% if os.beta.public_api %} - os-public-hostname: api.{{ opnfv.domain }} {% endif %} to: {% for unit_id in to_select() %} diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml index fe3a7224..3c3a7200 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml @@ -20,7 +20,6 @@ enable-live-migration: True enable-resize: True migration-auth-type: ssh - use-internal-endpoints: True {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml index 9132096e..87fe85e9 100644 --- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml @@ -23,9 +23,6 @@ {% endif %} {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.dashboard }} -{% endif %} -{% if os.beta.public_api %} - endpoint-type: internalURL {% endif %} to: {% for unit_id in to_select() %} diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml index 59469aef..488462fe 100644 --- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml @@ -4,7 +4,6 @@ charm: ./{{ ubuntu.release }}/ceilometer-agent options: openstack-origin: *openstack-origin - use-internal-endpoints: true {% endif %} {% if opnfv.storage_dict.ceph is defined %} cinder-ceph: diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml index 81426091..8e7d3a05 100644 --- a/ci/config_tpl/juju2/deployconfig.yaml +++ b/ci/config_tpl/juju2/deployconfig.yaml @@ -14,10 +14,6 @@ opnfv: {% if opnfv.spaces_dict.data is defined %} {% set netdata_prefix = opnfv.spaces_dict.data.cidr[:-4] %} dataNetwork: {{ opnfv.spaces_dict.data.cidr }} -{% endif %} -{% if lab.racks[0].osdomainname is defined %} - domain: {{ lab.racks[0].osdomainname }} - os-domain-name: {{ lab.racks[0].osdomainname }} {% endif %} ext-port: {{ lab.racks[0]['ext-port'] }} ext_port: {{ lab.racks[0]['ext-port'] }} diff --git a/ci/config_tpl/juju2/public-api-proxy.yaml b/ci/config_tpl/juju2/public-api-proxy.yaml deleted file mode 100644 index 02299aec..00000000 --- a/ci/config_tpl/juju2/public-api-proxy.yaml +++ /dev/null @@ -1,14 +0,0 @@ - haproxy: - charm: "local:{{ opnfv.distro }}/haproxy" - num_units: 1 - options: - services: |- -{% for service in public_api_services.values() %} - - service_name: {{ service.name }} - service_host: {{ public_api_ip }} - service_port: {{ service.port }} - service_options: [mode http, balance leastconn] - servers: [[{{ service.name }}, {{ service.ip }}, {{ service.port }}, 'maxconn 100 cookie S0 check']] -{% endfor %} - to: - - "nodes=0" diff --git a/ci/config_tpl/public-api-proxy.yaml b/ci/config_tpl/public-api-proxy.yaml deleted file mode 100644 index 02299aec..00000000 --- a/ci/config_tpl/public-api-proxy.yaml +++ /dev/null @@ -1,14 +0,0 @@ - haproxy: - charm: "local:{{ opnfv.distro }}/haproxy" - num_units: 1 - options: - services: |- -{% for service in public_api_services.values() %} - - service_name: {{ service.name }} - service_host: {{ public_api_ip }} - service_port: {{ service.port }} - service_options: [mode http, balance leastconn] - servers: [[{{ service.name }}, {{ service.ip }}, {{ service.port }}, 'maxconn 100 cookie S0 check']] -{% endfor %} - to: - - "nodes=0" -- cgit 1.2.3-korg