From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Mon, 19 Dec 2016 11:06:36 +0800
Subject: master only support newton

JIRA: COMPASS-513

Remove other roles and ppa, master only support newton.

Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../roles/onos_cluster/templates/keepalived.conf   | 47 ----------------------
 .../roles/onos_cluster/templates/ml2_conf.sh       | 15 -------
 .../roles/onos_cluster/templates/my_configs.debian | 14 -------
 .../roles/onos_cluster/templates/network.cfg       |  5 ---
 4 files changed, 81 deletions(-)
 delete mode 100644 deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/keepalived.conf
 delete mode 100755 deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/ml2_conf.sh
 delete mode 100644 deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/my_configs.debian
 delete mode 100644 deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/network.cfg

(limited to 'deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates')

diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/keepalived.conf b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/keepalived.conf
deleted file mode 100644
index 4ccf1c43..00000000
--- a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/keepalived.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-global_defs {
-    router_id {{ inventory_hostname }}
-}
-
-vrrp_sync_group VG1 {
-    group {
-        internal_vip
-        public_vip
-    }
-}
-
-vrrp_instance internal_vip {
-    interface {{ internal_vip.interface }}
-    virtual_router_id {{ vrouter_id_internal }}
-    state BACKUP
-    nopreempt
-    advert_int 1
-    priority {{ 50 + (host_index[inventory_hostname] * 50) }}
-
-    authentication {
-        auth_type PASS
-        auth_pass 1234
-    }
-
-    virtual_ipaddress {
-        {{ internal_vip.ip }}/{{ internal_vip.netmask }}  dev {{ internal_vip.interface }}
-    }
-}
-
-vrrp_instance public_vip {
-    interface br-ex
-    virtual_router_id {{ vrouter_id_public }}
-    state BACKUP
-    nopreempt
-    advert_int 1
-    priority {{ 50 + (host_index[inventory_hostname] * 50) }}
-
-    authentication {
-        auth_type PASS
-        auth_pass 4321
-    }
-
-    virtual_ipaddress {
-        {{ network_cfg.public_vip.ip }}/{{ network_cfg.public_vip.netmask }}  dev br-ex
-    }
-
-}
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/ml2_conf.sh b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/ml2_conf.sh
deleted file mode 100755
index 8af03df4..00000000
--- a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/ml2_conf.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-cat <<EOT>> /etc/neutron/plugins/ml2/ml2_conf.ini
-[onos]
-password = admin
-username = admin
-url_path = http://{{ ip_settings[groups['onos'][0]]['mgmt']['ip'] }}:8181/onos/vtn
-EOT
-
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/my_configs.debian b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/my_configs.debian
deleted file mode 100644
index 5ab1519b..00000000
--- a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/my_configs.debian
+++ /dev/null
@@ -1,14 +0,0 @@
-{%- for alias, intf in host_ip_settings.items() %}
-
-auto {{ alias }}
-iface {{ alias }} inet static
-    address {{ intf["ip"] }}
-    netmask {{ intf["netmask"] }}
-{% if "gw" in intf %}
-    gateway {{ intf["gw"] }}
-{% endif %}
-{% if intf["name"] == alias %}
-    pre-up ip link set {{ sys_intf_mappings[alias]["interface"] }} up
-    pre-up ip link add link {{ sys_intf_mappings[alias]["interface"] }} name {{ alias }} type vlan id {{ sys_intf_mappings[alias]["vlan_tag"] }}
-{% endif %}
-{% endfor %}
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/network.cfg b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/network.cfg
deleted file mode 100644
index 75ba90cb..00000000
--- a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/templates/network.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-bond_mappings: {{ network_cfg["bond_mappings"] }}
-ip_settings: {{ ip_settings[inventory_hostname] }}
-sys_intf_mappings: {{ sys_intf_mappings }}
-provider_net_mappings: {{ network_cfg["provider_net_mappings"] }}
-
-- 
cgit 1.2.3-korg