From 88df88a19674ccc0017836941b8ee32eaadf19fb Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Thu, 23 Mar 2017 06:19:54 -0700 Subject: Deleted charms with wrong license. Will source them differently in future. Change-Id: I0fc99ea03c6b6ca4701e63793cb2be60e56c7588 Signed-off-by: Stuart Mackie --- .../templates/contrail-barbican-auth.conf | 13 ------- .../templates/contrail-vrouter-agent.conf | 44 ---------------------- .../templates/contrail-vrouter-nodemgr.conf | 9 ----- .../neutron-contrail/templates/vnc_api_lib.ini | 16 -------- .../neutron-contrail/templates/vrouter-vgw.cfg | 21 ----------- 5 files changed, 103 deletions(-) delete mode 100644 charms/trusty/neutron-contrail/templates/contrail-barbican-auth.conf delete mode 100644 charms/trusty/neutron-contrail/templates/contrail-vrouter-agent.conf delete mode 100644 charms/trusty/neutron-contrail/templates/contrail-vrouter-nodemgr.conf delete mode 100644 charms/trusty/neutron-contrail/templates/vnc_api_lib.ini delete mode 100644 charms/trusty/neutron-contrail/templates/vrouter-vgw.cfg (limited to 'charms/trusty/neutron-contrail/templates') diff --git a/charms/trusty/neutron-contrail/templates/contrail-barbican-auth.conf b/charms/trusty/neutron-contrail/templates/contrail-barbican-auth.conf deleted file mode 100644 index 84ab4a0..0000000 --- a/charms/trusty/neutron-contrail/templates/contrail-barbican-auth.conf +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# [ WARNING ] -# Configuration file maintained by Juju. Local changes may be overwritten. -############################################################################### - -[DEFAULT] -auth_url = http://{{ auth_host }}:{{ auth_port }}/v2.0 -auth_version = 2 -admin_user = {{ admin_user }} -admin_password = {{ admin_password }} -admin_tenant_name = {{ admin_tenant_name }} -region = {{ auth_region }} - diff --git a/charms/trusty/neutron-contrail/templates/contrail-vrouter-agent.conf b/charms/trusty/neutron-contrail/templates/contrail-vrouter-agent.conf deleted file mode 100644 index 3543c2d..0000000 --- a/charms/trusty/neutron-contrail/templates/contrail-vrouter-agent.conf +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# [ WARNING ] -# Configuration file maintained by Juju. Local changes may be overwritten. -############################################################################### - -{%- if control_nodes %} - -[CONTROL-NODE] -server = {{ control_nodes|join(" ") }} - -{%- endif %} -{%- if discovery_server %} - -[DISCOVERY] -server = {{ discovery_server }} - -{%- endif %} - -[METADATA] -metadata_proxy_secret = {{ metadata_secret }} - -[NETWORKS] -control_network_ip = {{ control_network_ip }} - -[VIRTUAL-HOST-INTERFACE] -name = vhost0 -ip = {{ vhost_ip }} -gateway = {{ vhost_gateway }} -physical_interface = {{ vhost_physical }} - -{%- for vgw in vgws %} - -[GATEWAY-{{ loop.index0 }}] -routing_instance = {{ vgw["domain"] }}:{{ vgw["project"] }}:{{ vgw["network"] }}:{{ vgw["network"] }} -interface = {{ vgw["interface"] }} -ip_blocks = {{ vgw["subnets"]|join(" ") }} -routes = {{ vgw["routes"]|join(" ") }} - -{%- endfor %} - -[SERVICE-INSTANCE] -netns_command = /usr/bin/opencontrail-vrouter-netns -docker_command = /usr/bin/opencontrail-vrouter-docker - diff --git a/charms/trusty/neutron-contrail/templates/contrail-vrouter-nodemgr.conf b/charms/trusty/neutron-contrail/templates/contrail-vrouter-nodemgr.conf deleted file mode 100644 index ffea798..0000000 --- a/charms/trusty/neutron-contrail/templates/contrail-vrouter-nodemgr.conf +++ /dev/null @@ -1,9 +0,0 @@ -############################################################################### -# [ WARNING ] -# Configuration file maintained by Juju. Local changes may be overwritten. -############################################################################### - -[DISCOVERY] -server = {{ discovery_server }} -port = {{ discovery_port }} - diff --git a/charms/trusty/neutron-contrail/templates/vnc_api_lib.ini b/charms/trusty/neutron-contrail/templates/vnc_api_lib.ini deleted file mode 100644 index fd68487..0000000 --- a/charms/trusty/neutron-contrail/templates/vnc_api_lib.ini +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################### -# [ WARNING ] -# Configuration file maintained by Juju. Local changes may be overwritten. -############################################################################### - -[global] -WEB_SERVER = {{ api_server }} -WEB_PORT = {{ api_port }} - -[auth] -AUTHN_TYPE = keystone -AUTHN_PROTOCOL = http -AUTHN_SERVER = {{ auth_host }} -AUTHN_PORT = {{ auth_port }} -AUTHN_URL = /v2.0/tokens - diff --git a/charms/trusty/neutron-contrail/templates/vrouter-vgw.cfg b/charms/trusty/neutron-contrail/templates/vrouter-vgw.cfg deleted file mode 100644 index f5afd46..0000000 --- a/charms/trusty/neutron-contrail/templates/vrouter-vgw.cfg +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################### -# [ WARNING ] -# Configuration file maintained by Juju. Local changes may be overwritten. -############################################################################### - -{%- for vgw in vgws %} -{% set interface = vgw["interface"] %} -auto {{ interface }} -iface {{ interface }} inet manual - pre-up vif --create {{ interface }} --mac 00:00:5e:00:01:00 -{%- for subnet in vgw["subnets"] %} - post-up route add -net {{ subnet }} dev {{ interface }} -{%- endfor %} -{%- for subnet in vgw["subnets"] %} - pre-down route del -net {{ subnet }} dev {{ interface }} -{%- endfor %} - post-down id=$(vif --list | awk '/vif[0-9\/]+[\t ]+ OS: {{ interface }}/ { split($1, arr, "/"); print arr[2]; }'); \ - { [ -n "$id" ] && vif --delete $id; } || true - post-down ip link delete {{ interface }} -{%- endfor %} - -- cgit 1.2.3-korg