From 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Tue, 27 Dec 2016 17:44:34 +0800 Subject: Yamllint test JIRA: COMPASS-516 Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef Signed-off-by: liyuenan --- .../files/recover_network_opencontrail.py | 36 --- .../files/setup_networks_opencontrail.py | 121 ------- .../ansible/roles/open-contrail/tasks/ext-net.yml | 47 --- .../tasks/install/install-collector.yml | 24 -- .../open-contrail/tasks/install/install-common.yml | 104 ------ .../tasks/install/install-compute.yml | 55 ---- .../open-contrail/tasks/install/install-config.yml | 51 --- .../tasks/install/install-control.yml | 32 -- .../tasks/install/install-database.yml | 25 -- .../tasks/install/install-interface.yml | 34 -- .../open-contrail/tasks/install/install-kernel.yml | 60 ---- .../open-contrail/tasks/install/install-webui.yml | 26 -- .../ansible/roles/open-contrail/tasks/main.yml | 151 --------- .../open-contrail/tasks/provision/-node-common.yml | 28 -- .../tasks/provision/-rabbitmq-stop.yml | 30 -- .../open-contrail/tasks/provision/-redis-setup.yml | 34 -- .../tasks/provision/-vrouter-compute-setup.yml | 115 ------- .../tasks/provision/provision-add-nodes.yml | 91 ------ .../tasks/provision/provision-collector.yml | 106 ------- .../tasks/provision/provision-compute.yml | 269 ---------------- .../tasks/provision/provision-config.yml | 350 --------------------- .../tasks/provision/provision-control.yml | 69 ---- .../tasks/provision/provision-database.yml | 209 ------------ .../tasks/provision/provision-increase-limits.yml | 60 ---- .../tasks/provision/provision-rabbitmq.yml | 87 ----- .../tasks/provision/provision-route.yml | 50 --- .../tasks/provision/provision-toragent.yml | 85 ----- .../tasks/provision/provision-tsn.yml | 104 ------ .../tasks/provision/provision-webui.yml | 75 ----- .../open-contrail/tasks/uninstall-openvswitch.yml | 46 --- .../open-contrail/templates/install/override.j2 | 1 - .../provision/contrail-analytics-api-conf.j2 | 31 -- .../templates/provision/contrail-api-conf.j2 | 29 -- .../provision/contrail-api-supervisord-conf.j2 | 12 - .../templates/provision/contrail-collector-conf.j2 | 86 ----- .../templates/provision/contrail-control-conf.j2 | 15 - .../provision/contrail-device-manager-conf.j2 | 16 - .../templates/provision/contrail-discovery-conf.j2 | 43 --- .../contrail-discovery-supervisord-conf.j2 | 12 - .../templates/provision/contrail-dns-conf.j2 | 15 - .../provision/contrail-keystone-auth-conf.j2 | 9 - .../provision/contrail-query-engine-conf.j2 | 18 -- .../templates/provision/contrail-schema-conf.j2 | 22 -- .../templates/provision/contrail-sudoers.j2 | 5 - .../provision/contrail-svc-monitor-conf.j2 | 31 -- .../templates/provision/contrail-tor-agent-conf.j2 | 111 ------- .../templates/provision/contrail-tor-agent-ini.j2 | 12 - .../provision/contrail-vnc-api-lib-ini.j2 | 11 - .../provision/contrail-vrouter-agent-conf.j2 | 177 ----------- .../templates/provision/default-pmac.j2 | 1 - .../templates/provision/haproxy-contrail-cfg.j2 | 78 ----- .../provision/ifmap-authorization-properties.j2 | 2 - .../provision/ifmap-basicauthusers-properties.j2 | 30 -- .../templates/provision/ifmap-log4j-properties.j2 | 26 -- .../provision/ifmap-publisher-properties.j2 | 16 - .../templates/provision/keepalived-conf.j2 | 29 -- .../provision/neutron-contrail-plugin-ini.j2 | 15 - .../open-contrail/templates/provision/nova.j2 | 58 ---- .../templates/provision/qemu-device-acl-conf.j2 | 6 - .../templates/provision/rabbitmq-conf-single.j2 | 6 - .../templates/provision/rabbitmq-conf.j2 | 25 -- .../templates/provision/rabbitmq-cookie.j2 | 1 - .../templates/provision/rabbitmq-env-conf.j2 | 2 - .../templates/provision/vrouter-nodemgr-param.j2 | 1 - .../templates/provision/zookeeper-unique-id.j2 | 1 - .../open-contrail/templates/vrouter-functions.sh | 223 ------------- .../ansible/roles/open-contrail/vars/Debian.yml | 48 --- .../ansible/roles/open-contrail/vars/RedHat.yml | 9 - .../ansible/roles/open-contrail/vars/main.yml | 89 ------ 69 files changed, 3896 deletions(-) delete mode 100755 deploy/adapters/ansible/roles/open-contrail/files/recover_network_opencontrail.py delete mode 100755 deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py delete mode 100644 deploy/adapters/ansible/roles/open-contrail/tasks/ext-net.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/main.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/-node-common.yml delete mode 100644 deploy/adapters/ansible/roles/open-contrail/tasks/provision/-rabbitmq-stop.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/-redis-setup.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/-vrouter-compute-setup.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-add-nodes.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-collector.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-increase-limits.yml delete mode 100644 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-rabbitmq.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-route.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-toragent.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/tasks/uninstall-openvswitch.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/install/override.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-supervisord-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-collector-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-control-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-supervisord-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-dns-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-keystone-auth-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-query-engine-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-schema-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-sudoers.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-tor-agent-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-tor-agent-ini.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vnc-api-lib-ini.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/default-pmac.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-authorization-properties.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-basicauthusers-properties.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-log4j-properties.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-publisher-properties.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/keepalived-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/neutron-contrail-plugin-ini.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/nova.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/qemu-device-acl-conf.j2 delete mode 100644 deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-conf-single.j2 delete mode 100644 deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-conf.j2 delete mode 100644 deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-cookie.j2 delete mode 100644 deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-env-conf.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/vrouter-nodemgr-param.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/provision/zookeeper-unique-id.j2 delete mode 100755 deploy/adapters/ansible/roles/open-contrail/templates/vrouter-functions.sh delete mode 100755 deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/vars/RedHat.yml delete mode 100755 deploy/adapters/ansible/roles/open-contrail/vars/main.yml (limited to 'deploy/adapters/ansible/roles/open-contrail') diff --git a/deploy/adapters/ansible/roles/open-contrail/files/recover_network_opencontrail.py b/deploy/adapters/ansible/roles/open-contrail/files/recover_network_opencontrail.py deleted file mode 100755 index 554093b5..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/recover_network_opencontrail.py +++ /dev/null @@ -1,36 +0,0 @@ -import yaml -import netaddr -import os -import log as logging - -LOG = logging.getLogger("net-recover-opencontrail") -config_path = os.path.join(os.path.dirname(__file__), "network.cfg") - - -def setup_bondings(bond_mappings): - print bond_mappings - - -def setup_ips_new(config): - LOG.info("setup_ips_new enter") - network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) - intf_name = config["provider_net_mappings"][0]["interface"] - cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), intf_name) # noqa - # cmd = "ip link set br-ex up;" - # cmd += "ip addr add %s/%s brd %s dev %s;" \ - # % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), 'br-ex') # noqa - cmd += "route del default;" - cmd += "ip route add default via %s dev %s" % ( - config["ip_settings"]["br-prv"]["gw"], intf_name) - # cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], 'br-ex') # noqa - LOG.info("setup_ips_new: cmd=%s" % cmd) - os.system(cmd) - - -def main(config): - setup_ips_new(config) - -if __name__ == "__main__": - config = yaml.load(open(config_path)) - main(config) diff --git a/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py b/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py deleted file mode 100755 index a427ee3c..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py +++ /dev/null @@ -1,121 +0,0 @@ -import yaml -import netaddr -import os -import log as logging - -LOG = logging.getLogger("net-init-opencontrail") -config_path = os.path.join(os.path.dirname(__file__), "network.cfg") - - -def setup_bondings(bond_mappings): - print bond_mappings - - -def add_vlan_link(interface, ifname, vlan_id): - LOG.info("add_vlan_link enter") - cmd = "ip link add link %s name %s type vlan id %s; " % ( - ifname, interface, vlan_id) - cmd += "ip link set %s up; ip link set %s up" % (interface, ifname) - LOG.info("add_vlan_link: cmd=%s" % cmd) - os.system(cmd) - -# def add_ovs_port(ovs_br, ifname, uplink, vlan_id=None): -# LOG.info("add_ovs_port enter") -# cmd = "ovs-vsctl --may-exist add-port %s %s" % (ovs_br, ifname) -# if vlan_id: -# cmd += " tag=%s" % vlan_id -# cmd += " -- set Interface %s type=internal;" % ifname -# cmd += "ip link set dev %s address `ip link show %s |awk '/link\/ether/{print $2}'`;" \ # noqa -# % (ifname, uplink) -# cmd += "ip link set %s up;" % ifname -# LOG.info("add_ovs_port: cmd=%s" % cmd) -# os.system(cmd) - - -def setup_intfs(sys_intf_mappings, uplink_map): - LOG.info("setup_intfs enter") - for intf_name, intf_info in sys_intf_mappings.items(): - if intf_info["type"] == "vlan": - add_vlan_link( - intf_name, - intf_info["interface"], - intf_info["vlan_tag"]) -# elif intf_info["type"] == "ovs": -# add_ovs_port( -# intf_info["interface"], -# intf_name, -# uplink_map[intf_info["interface"]], -# vlan_id=intf_info.get("vlan_tag")) - else: - pass - - -def setup_ips(ip_settings, sys_intf_mappings): - LOG.info("setup_ips enter") - for intf_info in ip_settings.values(): - network = netaddr.IPNetwork(intf_info["cidr"]) - if sys_intf_mappings[intf_info["name"]]["type"] == "ovs": - intf_name = intf_info["name"] - else: - intf_name = intf_info["alias"] - if "gw" in intf_info: - continue - cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (intf_info["ip"], intf_info["netmask"], str(network.broadcast), intf_name) # noqa -# if "gw" in intf_info: -# cmd += "route del default;" -# cmd += "ip route add default via %s dev %s" % (intf_info["gw"], intf_name) # noqa - LOG.info("setup_ips: cmd=%s" % cmd) - os.system(cmd) - - -def setup_ips_new(config): - LOG.info("setup_ips_new enter") - network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) - intf_name = config["provider_net_mappings"][0]["interface"] - cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), intf_name) # noqa -# cmd = "ip link set br-ex up;" -# cmd += "ip addr add %s/%s brd %s dev %s;" \ -# % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), 'br-ex') # noqa - cmd += "route del default;" - cmd += "ip route add default via %s dev %s" % ( - config["ip_settings"]["br-prv"]["gw"], intf_name) -# cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], 'br-ex') # noqa - LOG.info("setup_ips_new: cmd=%s" % cmd) - os.system(cmd) - - -def setup_default_router(config): - LOG.info("setup_ips_new enter") -# network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) -# intf_name = config["provider_net_mappings"][0]["interface"] - cmd = "route del default;" - cmd += "ip route add default via %s dev %s" % ( - config["ip_settings"]["br-prv"]["gw"], "vhost0") - LOG.info("setup_default_router: cmd=%s" % cmd) - os.system(cmd) - - -def remove_ovs_kernel_mod(config): - LOG.info("remove_ovs_kernel_mod enter") - cmd = "rmmod vport_vxlan; rmmod openvswitch;" - LOG.info("remove_ovs_kernel_mod: cmd=%s" % cmd) - os.system(cmd) - - -def main(config): - uplink_map = {} - setup_bondings(config["bond_mappings"]) - remove_ovs_kernel_mod(config) - for provider_net in config["provider_net_mappings"]: - uplink_map[provider_net['name']] = provider_net['interface'] - - setup_intfs(config["sys_intf_mappings"], uplink_map) - setup_ips(config["ip_settings"], config["sys_intf_mappings"]) -# setup_ips_new(config) - setup_default_router(config) - -if __name__ == "__main__": - config = yaml.load(open(config_path)) - main(config) diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/ext-net.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/ext-net.yml deleted file mode 100644 index 3ef327ee..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/ext-net.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- name: add ext-network router of vgw on controller for open-contrail - shell: > - ip route add {{ public_net_info.floating_ip_cidr }} via {{ ip_settings[groups['compute'][0]]['br-prv']['ip'] }} dev {{ network_cfg.public_vip.interface }} ; - echo "ip route add {{ public_net_info.floating_ip_cidr }} via {{ ip_settings[groups['compute'][0]]['br-prv']['ip'] }} dev {{ network_cfg.public_vip.interface }}" >> /opt/contrail/bin/if-vhost0 ; - when: inventory_hostname in groups['opencontrail'] - - -- name: create vgw for open-contrail - shell: > - echo "lsof -ni :9090 ; while [ $? -ne 0 ]; do sleep 10; lsof -ni :9090; done" >> /etc/init.d/net_init; - echo "sleep 10" >> /etc/init.d/net_init; - echo "python /opt/contrail/utils/provision_vgw_interface.py --oper create --interface vgw1 --subnets {{ public_net_info.floating_ip_cidr }} --routes 0.0.0.0/0 --vrf default-domain:admin:{{ public_net_info.network }}:{{ public_net_info.network }}" >> /etc/init.d/net_init; - when: groups['opencontrail']|length !=0 and inventory_hostname == groups['compute'][0] - - -- name: add vgw router on compute(without vgw) for open-contrail - shell: echo "ip route add {{ public_net_info.floating_ip_cidr }} via {{ ip_settings[groups['compute'][0]]['br-prv']['ip'] }} dev vhost0" >> /etc/init.d/net_init - when: groups['opencontrail']|length !=0 and inventory_hostname not in groups['opencontrail'] and inventory_hostname != groups['compute'][0] - - - - - -# create a file with vgw ip on CompassCore, so that Jumper Host could access this to get vgw ip -- name: add vgw file on compass - local_action: file path=/home/opencontrail1.rc state=touch mode=0777 - run_once: True - when: groups['opencontrail']|length !=0 - -- name: update vgw file - local_action: lineinfile dest=/home/opencontrail1.rc line={{ ip_settings[groups['compute'][0]]['br-prv']['ip'] }} - run_once: True - when: groups['opencontrail']|length !=0 - -- name: add vgw file on compass - local_action: file path=/home/opencontrail2.rc state=touch mode=0777 - run_once: True - when: groups['opencontrail']|length !=0 - -- name: update vgw file - local_action: lineinfile dest=/home/opencontrail2.rc line={{ public_net_info.floating_ip_cidr }} - run_once: True - when: groups['opencontrail']|length !=0 - - - diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml deleted file mode 100755 index d3022893..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-collector.yml +++ /dev/null @@ -1,24 +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 -############################################################################## ---- -#- hosts: collector -# sudo: yes -# tasks: - -- name: "temporary disable supervisor analytics" - template: -# src: "templates/override.j2" - src: "../../templates/install/override.j2" - dest: "/etc/init/supervisor-analytics.override" - -- name: "install contrail openstack analytics package" -# apt: -# name: "contrail-openstack-analytics" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: collector_package diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml deleted file mode 100755 index e94621bc..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-common.yml +++ /dev/null @@ -1,104 +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 -############################################################################## ---- -#- hosts: all -# sudo: yes -# tasks: -#- name: "copy contrail install package temporary" -# sudo: True -# copy: -# src: "{{ package }}" -# dest: "/tmp/{{ package }}" - -- name: get image http server - shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf - register: http_server - -- name: download OpenContrail package file - get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/open-contrail/{{ package }}" dest=/tmp/{{ package }} -#" - -- name: "install contrail install package" -# sudo: True - apt: - deb: "/tmp/{{ package }}" - force: yes - -- name: "delete temporary contrail install package" -# sudo: True - file: - dest: "/tmp/{{ package }}" - state: "absent" - -- name: "make directory for contrail binary files" -# sudo: True - file: - path: "/opt/contrail/bin" - state: "directory" - -- name: "make directory for contrail repository" -# sudo: True - file: - path: "/opt/contrail/contrail_install_repo" - state: "directory" - -- name: "unarchive contrail packages" -# sudo: True - unarchive: - src: "/opt/contrail/contrail_packages/contrail_debs.tgz" - dest: "/opt/contrail/contrail_install_repo" - copy: no - -- name: "find required packages in advance" -# sudo: True - shell: "find /opt/contrail/contrail_install_repo -name binutils_*.deb -or -name make_*.deb -or -name libdpkg-perl_*.deb -or -name dpkg-dev_*.deb -or -name patch_*.deb -type f" - register: required_packages - changed_when: no - -- name: "install required packages" -# sudo: True - apt: - deb: "{{ item }}" - force: yes - with_items: required_packages.stdout_lines - ignore_errors: True - -- name: modify source list -# sudo: True - lineinfile: - dest: "/etc/apt/sources.list" - line: "deb file:/opt/contrail/contrail_install_repo ./" - insertbefore: "BOF" - -- name: "modify apt configuration" -# sudo: True - lineinfile: - dest: "/etc/apt/apt.conf" - line: "APT::Get::AllowUnauthenticated \"true\";" - create: "yes" - -- name: "copy apt preferences file" -# sudo: True - shell: "cp /opt/contrail/contrail_packages/preferences /etc/apt/preferences" - args: - creates: "/etc/apt/preferences" - -- name: create contrail packages list -# sudo: True - shell: "dpkg-scanpackages . | gzip -9c > Packages.gz" - args: - chdir: "/opt/contrail/contrail_install_repo" - creates: "Packages.gz" - -- name: install contrail setup package - sudo: True - apt: - name: "contrail-setup" - update_cache: yes - force: yes diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml deleted file mode 100755 index 4e4a5ad5..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-compute.yml +++ /dev/null @@ -1,55 +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 -############################################################################## ---- -#- hosts: [compute, tsn] -# sudo: yes -# tasks: -- name: "temporary disable supervisor vrouter" -# sudo: True - template: - src: "../../templates/install/override.j2" - dest: "/etc/init/supervisor-vrouter.override" - -# - name: "install nova-compute for contrail package" -# apt: -# name: "nova-compute" -# when: install_nova - -- name: "install contrail vrouter 3.13.0-40 package" -# apt: -# name: "contrail-vrouter-3.13.0-40-generic" -# when: ansible_kernel == "3.13.0-40-generic" -# sudo: True - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: vrouter_package - when: ansible_kernel == kernel_required - -- name: "install contrail vrouter dkms package" -# apt: -# name: "contrail-vrouter-dkms" -# when: ansible_kernel != "3.13.0-40-generic" -# sudo: True - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: dkms_package - when: ansible_kernel != kernel_required - -# - name: "install contrail vrouter common package" -# apt: -# name: "contrail-vrouter-common" - -# - name: "install contrail nova vif package" -# apt: -# name: "contrail-nova-vif" - -- name: "install contrail vrouter common & nova vif package" -# sudo: True - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" - with_items: compute_package | union(compute_package_noarch) - - diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml deleted file mode 100755 index b66e3e45..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-config.yml +++ /dev/null @@ -1,51 +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 -############################################################################## ---- -#- hosts: config -# sudo: yes -# tasks: -- name: "temporary disable supervisor config" -# sudo: True - template: -# src: "templates/override.j2" - src: "../../templates/install/override.j2" - dest: "/etc/init/supervisor-config.override" - -- name: "temporary disable neutron server" -# sudo: True - template: -# src: "templates/override.j2" - src: "../../templates/install/override.j2" - dest: "/etc/init/neutron-server.override" - -############################################### -################ workaround ################# -############################################### -- name: "backup keepalived conf" - shell: mv /etc/keepalived/keepalived.conf /home/keepalived.conf - -- name: "uninstall keepalived" - action: "{{ ansible_pkg_mgr }} name=keepalived state=absent" - -- name: "install iproute" - action: "{{ ansible_pkg_mgr }} name=iproute state=present" - -- name: "install iproute" - action: "{{ ansible_pkg_mgr }} name=keepalived state=present" - -- name: "restore keepalived conf" - shell: mv /home/keepalived.conf /etc/keepalived/keepalived.conf -############################################### - -- name: "install contrail openstack config package" -# sudo: True -# apt: -# name: "contrail-openstack-config" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: config_package diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml deleted file mode 100755 index ab7d4ad3..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-control.yml +++ /dev/null @@ -1,32 +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 -############################################################################## ---- -#- hosts: control -# sudo: yes -# tasks: -- name: "temporary disable supervisor control" -# sudo: True - template: -# src: "templates/override.j2" - src: "../../templates/install/override.j2" - dest: "/etc/init/supervisor-control.override" - -- name: "temporary disable supervisor dns" -# sudo: True - template: -# src: "templates/override.j2" - src: "../../templates/install/override.j2" - dest: "/etc/init/supervisor-dns.override" - -- name: "install contrail openstack control package" -# sudo: True -# apt: -# name: "contrail-openstack-control" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: control_package diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml deleted file mode 100755 index 5c89ede9..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-database.yml +++ /dev/null @@ -1,25 +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 -############################################################################## ---- -#- hosts: database -# sudo: yes -# tasks: -- name: "temporary disable supervisor database" -# sudo: True - template: -# src: "templates/override.j2" - src: "../../templates/install/override.j2" - dest: "/etc/init/supervisor-database.override" - -- name: "install contrail openstack database package" -# sudo: True -# apt: -# name: "contrail-openstack-database" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: database_package diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml deleted file mode 100755 index 3f7b43c1..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-interface.yml +++ /dev/null @@ -1,34 +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 -############################################################################## ---- -#- hosts: all -# sudo: yes -# tasks: -#- name: get last ip address -# shell: expr substr `cat /etc/hostname` 5 1 -# register: lastip - -#- name: "configure interface" -## sudo: True -# lineinfile: -# dest: "/etc/network/interfaces" -# line: "{{ item }}" -# with_items: -# - "auto {{ contrail_vhost_device }}" -# - "iface {{ contrail_vhost_device }} inet static" -# - "\taddress {{ contrail_vhost_address }}" -# - "\tnetmask {{ contrail_vhost_netmask }}" - -- name: "set interface address" -# sudo: True - shell: "ifconfig {{ contrail_vhost_device }} {{ contrail_vhost_address }} netmask {{ contrail_vhost_netmask }}" - -- name: "up interface" -# sudo: True - shell: "ifconfig {{ contrail_vhost_device }} up" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml deleted file mode 100755 index be9a8ac9..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-kernel.yml +++ /dev/null @@ -1,60 +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 -############################################################################## ---- -#- hosts: all -# sudo: yes -# tasks: - -- name: "install Ubuntu kernel" -# sudo: True -# apt: -# name: "linux-headers-3.13.0-40" -# name: "linux-headers-3.13.0-40-generic" -# name: "linux-image-3.13.0-40-generic" -# name: "linux-image-extra-3.13.0-40-generic" -# when: (kernel_install) and (ansible_kernel != "3.13.0-40-generic") - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: kernel_package | union(kernel_package_noarch) - when: (kernel_install) and (ansible_kernel != kernel_required) - -- name: "setup grub" -# sudo: True - lineinfile: - dest: "/etc/default/grub" - regexp: "GRUB_DEFAULT=.*" - line: "GRUB_DEFAULT='Advanced options for Ubuntu>Ubuntu, with Linux 3.13.0-40-generic'" -# when: (kernel_install) and (ansible_kernel != "3.13.0-40-generic") - when: (kernel_install) and (ansible_kernel != kernel_required) - -- name: "reflect grub" -# sudo: True - shell: "update-grub2" -# when: (kernel_install) and (ansible_kernel != "3.13.0-40-generic") - when: (kernel_install) and (ansible_kernel != kernel_required) - -- name: "reboot Server" -# sudo: True - shell: "shutdown -r now" - async: 0 - poll: 0 - ignore_errors: true - notify: Wait for server to come back -# when: (kernel_install) and (ansible_kernel != "3.13.0-40-generic") - when: (kernel_install) and (ansible_kernel != kernel_required) - -# handlers: -- name: "Wait for server to come back" - local_action: - module: wait_for - host={{ inventory_hostname }} - port=22 - delay=30 - timeout=600 -# when: (kernel_install) and (ansible_kernel != "3.13.0-40-generic") - when: (kernel_install) and (ansible_kernel != kernel_required) diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml deleted file mode 100755 index 6dbe1e74..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/install/install-webui.yml +++ /dev/null @@ -1,26 +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 -############################################################################## ---- -#- hosts: webui -# sudo: yes -# tasks: - -- name: "temporary disable supervisor webui" -# sudo: True - template: -# src: "templates/override.j2" - src: "../../templates/install/override.j2" - dest: "/etc/init/supervisor-webui.override" - -- name: "install contrail openstack webui package" -# sudo: True -# apt: -# name: "contrail-openstack-webui" - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: webui_package diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml deleted file mode 100755 index 7d0f1a9e..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml +++ /dev/null @@ -1,151 +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 -############################################################################## ---- - -- include_vars: "{{ ansible_os_family }}.yml" - -- name: backup rabbitmq-server - shell: cp /etc/init.d/rabbitmq-server /home/rabbitmq-server - when: inventory_hostname in groups['opencontrail'] - -- name: Disable Service Daemon - shell: if [ -f “\/opt\/service” ] ; then mv /opt/service /opt/service.bak ; fi - when: groups['opencontrail']|length !=0 - -- name: Install common on all hosts for Open Contrail - include: install/install-common.yml - when: groups['opencontrail']|length !=0 - # Compass install OpenStack with not only OpenContrail but also ODL or ONOS, and sometimes user just installs OpenStack, so item 'opencontrail_control' is kind of a mark that whether Compass install OpenContrail or not. - -#- name: Install kernal on all hosts for Open Contrail -# include: install/install-kernel.yml -# when: groups['opencontrail_control']|length !=0 - -- name: Install database for Open Contrail - include: install/install-database.yml - when: inventory_hostname in groups['opencontrail'] - -- name: Install config for Open Contrail - include: install/install-config.yml - when: inventory_hostname in groups['opencontrail'] - -- name: Install config for Open Contrail - include: install/install-control.yml - when: inventory_hostname in groups['opencontrail'] - -- name: Install collector for Open Contrail - include: install/install-collector.yml - when: inventory_hostname in groups['opencontrail'] - -- name: Install webui for Open Contrail - include: install/install-webui.yml - when: inventory_hostname in groups['opencontrail'] - -- name: Install compute for Open Contrail - include: install/install-compute.yml - when: groups['opencontrail']|length !=0 and inventory_hostname not in groups['opencontrail'] -# or inventory_hostname in groups['opencontrail_tsn'] - - -# change vhost0 on eth1 -#- name: Install interface on all hosts for Open Contrail -# include: install/install-interface.yml -# when: groups['opencontrail']|length !=0 - -#- include: install/install-common.yml -#- include: install/install-kernel.yml -#- include: install/install-database.yml -#- include: install/install-config.yml -#- include: install/install-control.yml -#- include: install/install-collector.yml -#- include: install/install-webui.yml -#- include: install/install-compute.yml -#- include: install/install-interface.yml - - -#- name: Provision route on all hosts for Open Contrail -# include: provision/provision-route.yml -# when: groups['opencontrail_control']|length !=0 - - -- name: Provision RabbitMQ on OpenContrail config nodes - include: provision/provision-rabbitmq.yml - when: inventory_hostname in groups['opencontrail'] - -- name: Provision increase limits for Open Contrail - include: provision/provision-increase-limits.yml - when: inventory_hostname in groups['opencontrail'] -#or inventory_hostname in groups['opencontrail_config'] or inventory_hostname in groups['opencontrail_collector'] or inventory_hostname in groups['opencontrail_database'] - - -- name: Provision database for Open Contrail - include: provision/provision-database.yml - when: inventory_hostname in groups['opencontrail'] - - -- name: Provision config for Open Contrail - include: provision/provision-config.yml - when: inventory_hostname in groups['opencontrail'] - -- name: Provision control for Open Contrail - include: provision/provision-control.yml - when: inventory_hostname in groups['opencontrail'] - - -- name: Provision collector for Open Contrail - include: provision/provision-collector.yml - when: inventory_hostname in groups['opencontrail'] - - -- name: Provision add nodes for Open Contrail - include: provision/provision-add-nodes.yml - when: inventory_hostname in groups['opencontrail'] - - -- name: Provision webui for Open Contrail - include: provision/provision-webui.yml - when: inventory_hostname in groups['opencontrail'] - - -- name: Provision compute for Open Contrail - include: provision/provision-compute.yml - when: groups['opencontrail']|length !=0 and inventory_hostname not in groups['opencontrail'] - -- name: Remove openvswitch on compute - include: uninstall-openvswitch.yml - when: groups['opencontrail']|length !=0 and inventory_hostname not in groups['opencontrail'] - -- name: Config ext-net network - include: ext-net.yml - -- name: Enable Service Daemon - shell: if [ -f “\/opt\/service.bak” ] ; then mv /opt/service.bak /opt/service ; fi - when: groups['opencontrail']|length !=0 - -#- name: Provision tsn for Open Contrail -# include: provision/provision-tsn.yml -# when: inventory_hostname in groups['opencontrail_tsn'] - - -#- name: Provision toragent for Open Contrail -# include: provision/provision-toragent.yml -# when: inventory_hostname in groups['opencontrail_tsn'] - -#- include: provision/provision-route.yml -#- include: provision/provision-rabbitmq.yml -#- include: provision/provision-increase-limits.yml -#- include: provision/provision-database.yml -#- include: provision/provision-config.yml -#- include: provision/provision-control.yml -#- include: provision/provision-collector.yml -#- include: provision/provision-add-nodes.yml -#- include: provision/provision-webui.yml -#- include: provision/provision-compute.yml -#- include: provision/provision-tsn.yml -#- include: provision/provision-toragent.yml diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-node-common.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-node-common.yml deleted file mode 100755 index 759f940f..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-node-common.yml +++ /dev/null @@ -1,28 +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 -############################################################################## ---- -- name: "disable ufw" - ufw: - state: "disabled" - -- name: "change value of kernel.core_pattern" - sysctl: - name: "kernel.core_pattern" - value: "/var/crashes/core.%e.%p.%h.%t" - -- name: "change value of net.ipv4.ip_forward" - sysctl: - name: "net.ipv4.ip_forward" - value: "1" - -- name: "make crashes directory" - file: - path: "/var/crashes" - state: "directory" - mode: 0777 diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-rabbitmq-stop.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-rabbitmq-stop.yml deleted file mode 100644 index ec6b2fe0..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-rabbitmq-stop.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- name: 'stop rabbitmq server' - service: - name: 'rabbitmq-server' - state: 'stopped' - -- name: 'check beam process' - shell: 'ps ax | grep -v grep | grep beam' - register: beam_process - changed_when: no - ignore_errors: yes - -- name: 'kill beam processes' - shell: 'pkill -9 beam' - when: beam_process.stdout - -- name: 'check epmd process' - shell: 'ps ax | grep -v grep | grep epmd' - register: epmd_process - changed_when: no - ignore_errors: yes - -- name: 'kill epmd processes' - shell: 'pkill -9 epmd' - when: epmd_process.stdout - -- name: 'remove mnesia directory' - file: - name: '/var/lib/rabbitmq/mnesia' - state: 'absent' diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-redis-setup.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-redis-setup.yml deleted file mode 100755 index c4a66240..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-redis-setup.yml +++ /dev/null @@ -1,34 +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 -############################################################################## ---- -- name: "stop redis server" - service: - name: "redis-server" - state: "stopped" - -- name: "modify redis server configuration" - replace: - dest: "/etc/redis/redis.conf" - regexp: "{{ item.regexp }}" - replace: "{{ item.replace }}" - with_items: - - { regexp: "^\\s*bind", replace: "#bind" } - - { regexp: "^\\s*save", replace: "#save" } - - { regexp: "^\\s*dbfilename", replace: "#dbfilename" } - - { regexp: "^\\s*lua-time-limit\\s*\\d*", replace: "lua-time-limit 15000" } - -- name: "delete redis dump" - file: - dest: "/var/lib/redis/dump.rdb" - state: "absent" - -- name: "start redis server" - service: - name: "redis-server" - state: "started" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-vrouter-compute-setup.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-vrouter-compute-setup.yml deleted file mode 100755 index be1879af..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/-vrouter-compute-setup.yml +++ /dev/null @@ -1,115 +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 -############################################################################## ---- -- name: "change owner nova log directory" - file: - dest: "/var/log/nova" - state: "directory" - owner: "nova" - group: "nova" - recurse: yes - -- name: "delete values from nova config" - ini_file: - dest: "/etc/nova/nova.conf" - section: "{{ item.section }}" - option: "{{ item.option }}" - with_items: - - { section: "DEFAULT", option: "sql_connection" } - - { section: "DEFAULT", option: "quantum_admin_tenant_name" } - - { section: "DEFAULT", option: "quantum_admin_username" } - - { section: "DEFAULT", option: "quantum_admin_password" } - - { section: "DEFAULT", option: "quantum_admin_auth_url" } - - { section: "DEFAULT", option: "quantum_auth_strategy" } - - { section: "DEFAULT", option: "quantum_url" } - -- name: "set values to nova config" - ini_file: - dest: "/etc/nova/nova.conf" - section: "{{ item.section }}" - option: "{{ item.option }}" - value: "{{ item.value }}" - with_items: - - { section: "DEFAULT", option: "auth_strategy", value: "keystone" } - - { section: "DEFAULT", option: "libvirt_nonblocking", value: "True" } - - { section: "DEFAULT", option: "libvirt_inject_partition", value: "-1" } - - { section: "DEFAULT", option: "rabbit_host", value: "{{ contrail_haproxy_address }}" } - - { section: "DEFAULT", option: "rabbit_port", value: "5672" } - - { section: "DEFAULT", option: "glance_host", value: "{{ contrail_haproxy_address }}" } - - { section: "DEFAULT", option: "glance_port", value: "9292" } - - { section: "DEFAULT", option: "neutron_admin_tenant_name", value: "service" } - - { section: "DEFAULT", option: "neutron_admin_username", value: "neutron" } - - { section: "DEFAULT", option: "neutron_admin_password", value: "{{ contrail_admin_password }}" } - - { section: "DEFAULT", option: "neutron_admin_auth_url", value: "http://{{ contrail_haproxy_address }}:35357/v2.0/" } - - { section: "DEFAULT", option: "neutron_url", value: "http://{{ contrail_haproxy_address }}:9696/" } - - { section: "DEFAULT", option: "neutron_url_timeout", value: "300" } - - { section: "DEFAULT", option: "network_api_class", value: "nova.network.neutronv2.api.API" } - - { section: "DEFAULT", option: "compute_driver", value: "libvirt.LibvirtDriver" } - - { section: "DEFAULT", option: "network_api_class", value: " nova_contrail_vif.contrailvif.ContrailNetworkAPI" } - - { section: "DEFAULT", option: "ec2_private_dns_show_ip", value: "False" } - - { section: "DEFAULT", option: "novncproxy_base_url", value: "http://{{ contrail_haproxy_address }}:5999/vnc_auto.html" } - - { section: "DEFAULT", option: "vncserver_enabled", value: "True" } - - { section: "DEFAULT", option: "vncserver_listen", value: "{{ contrail_address }}" } - - { section: "DEFAULT", option: "vncserver_proxyclient_address", value: "{{ contrail_address }}" } - - { section: "DEFAULT", option: "security_group_api", value: "neutron" } - - { section: "DEFAULT", option: "heal_instance_info_cache_interval", value: "0" } - - { section: "DEFAULT", option: "image_cache_manager_interval", value: "0" } - - { section: "DEFAULT", option: "libvirt_cpu_mode", value: "none" } - - { section: "DEFAULT", option: "libvirt_vif_driver", value: "nova_contrail_vif.contrailvif.VRouterVIFDriver" } - - { section: "database", option: "connection", value: "mysql://nova:nova@{{ contrail_haproxy_address }}/nova?charset=utf8" } - - { section: "database", option: "idle_timeout", value: "180" } - - { section: "database", option: "max_retries", value: "-1" } - - { section: "keystone_authtoken", option: "admin_tenant_name", value: "service" } - - { section: "keystone_authtoken", option: "admin_user", value: "nova" } - - { section: "keystone_authtoken", option: "admin_password", value: "{{ contrail_admin_password }}" } - - { section: "keystone_authtoken", option: "auth_protocol", value: "http" } - - { section: "keystone_authtoken", option: "auth_host", value: "{{ contrail_haproxy_address }}" } - - { section: "keystone_authtoken", option: "signing_dir", value: "/tmp/keystone-signing-nova" } - - - -#- { section: "DEFAULT", option: "rabbit_host", value: "{{ hostvars[groups['config'][0]]['contrail_address'] }}" } -#- { section: "DEFAULT", option: "glance_host", value: "{{ hostvars[groups['openstack'][0]]['contrail_address'] }}" } -#- { section: "DEFAULT", option: "neutron_admin_auth_url", value: "http://{{ hostvars[groups['openstack'][0]]['contrail_address'] }}:35357/v2.0/" } -#- { section: "DEFAULT", option: "neutron_url", value: "http://{{ hostvars[groups['config'][0]]['contrail_address'] }}:9696/" } -#- { section: "DEFAULT", option: "novncproxy_base_url", value: "http://{{ hostvars[groups['openstack'][0]]['contrail_mgmt_address'] }}:5999/vnc_auto.html" } -#- { section: "database", option: "connection", value: "mysql://nova:nova@{{ hostvars[groups['openstack'][0]]['contrail_address'] }}/nova?charset=utf8" } -#- { section: "keystone_authtoken", option: "auth_host", value: "{{ hostvars[groups['openstack'][0]]['contrail_address'] }}" } - - - -- name: "change database address if same node as first openstack node" - ini_file: - dest: "/etc/nova/nova.conf" - section: "database" - option: "connection" - value: "mysql://nova:nova@127.0.0.1/nova?charset=utf8" - when: groups['openstack'][0] == inventory_hostname - -- name: "add respawn to nova compute config" - lineinfile: - dest: "/etc/init/nova-compute.conf" - line: "respawn" - insertbefore: "pre-start script" - -- name: "add respawn limit to nova compute config" - lineinfile: - dest: "/etc/init/nova-compute.conf" - line: "respawn limit 10 90" - insertafter: "respawn" - -- name: "restart nova compute" - service: - name: "nova-compute" - state: "restarted" - -- name: "delete nova sqlite database" - file: - dest: "/var/lib/nova/nova.sqlite" - state: "absent" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-add-nodes.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-add-nodes.yml deleted file mode 100755 index 58a6bb07..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-add-nodes.yml +++ /dev/null @@ -1,91 +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 -############################################################################## ---- -#- hosts: config -# sudo: yes -# tasks: - -#- name: "recover rabbitmq-server service script" -# shell: cp /home/rabbitmq-server /etc/init.d/rabbitmq-server - -#- name: "restart rabbitmq-server" -# service: -# name: "rabbitmq-server" -# state: "restarted" - -#- name: "wait rabbitmq-server start" -# shell: sleep 5 - -- name: "restart contrail-discovery" - service: - name: "contrail-discovery" - state: "restarted" - -- name: "wait contrail-discovery" - shell: sleep 5 - -- name: "restart contrail-api" - service: - name: "contrail-api" - state: "restarted" - -- name: "restart apache2" - service: - name: "apache2" - state: "restarted" - -- name: "check contrail-api" - shell: lsof -ni :8082 ; while [ $? -ne 0 ]; do sleep 10; lsof -ni :8082; done; sleep 20; - -- name: "wait contrail-api" - shell: sleep 20 - -- name: "provision config node" - shell: "python /opt/contrail/utils/provision_config_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}" -# when: inventory_hostname in groups['opencontrail_config'] - -#- hosts: database -# sudo: yes -# tasks: -- name: "provision database node" - shell: "python /opt/contrail/utils/provision_database_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}" -# when: inventory_hostname in groups['opencontrail_database'] - - -#- hosts: collector -# sudo: yes -# tasks: -- name: "provision collector node" - shell: "python /opt/contrail/utils/provision_analytics_node.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}" -# when: inventory_hostname in groups['opencontrail_collector'] - -#- hosts: control -# sudo: yes -# tasks: -- name: "provision control node" - shell: "python /opt/contrail/utils/provision_control.py --api_server_ip {{ contrail_haproxy_address }} --api_server_port 8082 --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }} --router_asn {{ contrail_router_asn }}" -# when: inventory_hostname in groups['opencontrail_control'] - -#- hosts: config -# sudo: yes -# tasks: -- name: "provision metadata services" - shell: "python /opt/contrail/utils/provision_linklocal.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --oper add --ipfabric_service_ip 10.84.50.1 --ipfabric_service_port 8775 --linklocal_service_name metadata --linklocal_service_ip 169.254.169.254 --linklocal_service_port 80" - run_once: yes -# when: inventory_hostname in groups['opencontrail_config'] - - -#- hosts: config -# sudo: yes -# tasks: -- name: "provision encap" - shell: "python /opt/contrail/utils/provision_encap.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --oper add --encap_priority MPLSoUDP,MPLSoGRE,VXLAN" - run_once: yes -# when: inventory_hostname in groups['opencontrail_config'] - diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-collector.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-collector.yml deleted file mode 100755 index b09f83a8..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-collector.yml +++ /dev/null @@ -1,106 +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 -############################################################################## ---- -#- hosts: collector -# sudo: yes -# tasks: - -- name: "enable supervisor analytics" - file: - path: "/etc/init/supervisor-analytics.override" - state: "absent" - - -- name: "redis-setup" - include: -redis-setup.yml - - -- name: "node-common" - include: -node-common.yml - - -- name: "fix up contrail collector config" - template: - src: "../../templates/provision/contrail-collector-conf.j2" - dest: "/etc/contrail/contrail-collector.conf" - - -- name: "fix up contrail query engine config" - template: - src: "../../templates/provision/contrail-query-engine-conf.j2" - dest: "/etc/contrail/contrail-query-engine.conf" - - -- name: "fix up contrail analytics api config" - template: - src: "../../templates/provision/contrail-analytics-api-conf.j2" - dest: "/etc/contrail/contrail-analytics-api.conf" - - -- name: "modify contrail analytics nodemgr config" - ini_file: - dest: "/etc/contrail/contrail-analytics-nodemgr.conf" - section: "DISCOVERY" - option: "server" - value: "{{ contrail_haproxy_address }}" - - -- name: "fix up contrail keystone auth config" - template: - src: "../../templates/provision/contrail-keystone-auth-conf.j2" - dest: "/etc/contrail/contrail-keystone-auth.conf" - force: no - - -- name: "delete contrail alarm gen supervisord config file" - file: - dest: "/etc/contrail/supervisord_analytics_files/contrail-alarm-gen.ini" - state: "absent" - - -- name: "modify contrail snmp collector config file" - ini_file: - dest: "/etc/contrail/contrail-snmp-collector.conf" - section: "{{ item.section }}" - option: "{{ item.option }}" - value: "{{ item.value }}" - with_items: - - { section: "DEFAULTS", option: "zookeeper", value: "{{ contrail_address }}:2181" } - - { section: "DISCOVERY", option: "disc_server_ip", value: "{{ contrail_haproxy_address }}" } - - { section: "DISCOVERY", option: "disc_server_port", value: "5998" } - - -- name: "modify contrail snmp collector ini file" - ini_file: - dest: "/etc/contrail/supervisord_analytics_files/contrail-snmp-collector.ini" - section: "program:contrail-snmp-collector" - option: "command" - value: "/usr/bin/contrail-snmp-collector --conf_file /etc/contrail/contrail-snmp-collector.conf --conf_file /etc/contrail/contrail-keystone-auth.conf" - - -- name: "modify contrail topology config file" - ini_file: - dest: "/etc/contrail/contrail-topology.conf" - section: "DEFAULTS" - option: "zookeeper" - value: "{{ contrail_address }}" - - -- name: "modify contrail topology ini file" - ini_file: - dest: "/etc/contrail/supervisord_analytics_files/contrail-topology.ini" - section: "program:contrail-topology" - option: "command" - value: "/usr/bin/contrail-topology --conf_file /etc/contrail/contrail-topology.conf" - - -- name: "restart supervisor analytics" - service: - name: "supervisor-analytics" - state: "restarted" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml deleted file mode 100755 index 374c4e13..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-compute.yml +++ /dev/null @@ -1,269 +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 -############################################################################## ---- -#- hosts: compute -# sudo: yes -# tasks: -- name: "enable supervisor vrouter" - file: - path: "/etc/init/supervisor-vrouter.override" - state: "absent" - -- include: -node-common.yml - -- name: "check cgroup device acl in qemu conf" - shell: "grep -q '^\\s*cgroup_device_acl' /etc/libvirt/qemu.conf" - register: deviceacl - ignore_errors: yes - changed_when: no - -- name: "create cgroup device acl for qemu conf" - template: - src: "../../templates/provision/qemu-device-acl-conf.j2" - dest: "/tmp/qemu-device-acl.conf" - when: deviceacl | failed - -- name: "combination of the qemu configuration" - shell: "cat /tmp/qemu-device-acl.conf >> /etc/libvirt/qemu.conf" - when: deviceacl | failed - -- name: "delete temporary configuration file" - file: - dest: "/tmp/qemu-device-acl.conf" - state: "absent" - when: deviceacl | failed - -- name: "fix up vrouter nodemgr param" - template: - src: "../../templates/provision/vrouter-nodemgr-param.j2" - dest: "/etc/contrail/vrouter_nodemgr_param" - -- name: "set contrail device name for ansible" - set_fact: - contrail_ansible_device: "ansible_{{ contrail_vhost_device }}" - -- name: "fix up default pmac" - template: - src: "../../templates/provision/default-pmac.j2" - dest: "/etc/contrail/default_pmac" - -- name: "copy agent param config from template" - shell: "cp /etc/contrail/agent_param.tmpl /etc/contrail/agent_param" - -- name: "modify agent param config" - lineinfile: - dest: "/etc/contrail/agent_param" - regexp: "dev=__DEVICE__" - line: "dev={{ contrail_vhost_device }}" - -#- name: "get last ip address" -# shell: expr substr `cat /etc/hostname` 5 1 -# register: lastip - -- name: "fix up contrail vrouter agent config" - template: - src: "../../templates/provision/contrail-vrouter-agent-conf.j2" - dest: "/etc/contrail/contrail-vrouter-agent.conf" - -- name: "delete lines for contrail interface" - shell: "{{ item }}" - with_items: - - "sed -e '/auto {{ contrail_vhost_device }}/,$d' /etc/network/interfaces > /tmp/contrail-interfaces-top" - - "sed -n -e '/auto {{ contrail_vhost_device }}/,$p' /etc/network/interfaces > /tmp/contrail-interfaces-bottom" - - "sed -i -e '/auto {{ contrail_vhost_device }}/d' /tmp/contrail-interfaces-bottom" - - "sed -i -n -e '/auto .*/,$p' /tmp/contrail-interfaces-bottom" - - "cat /tmp/contrail-interfaces-top /tmp/contrail-interfaces-bottom > /etc/network/interfaces" - -- name: "delete lines for vrouter interface" - shell: "{{ item }}" - with_items: - - "sed -e '/auto vhost0/,$d' /etc/network/interfaces > /tmp/contrail-interfaces-top" - - "sed -n -e '/auto vhost0/,$p' /etc/network/interfaces > /tmp/contrail-interfaces-bottom" - - "sed -i -e '/auto vhost0/d' /tmp/contrail-interfaces-bottom" - - "sed -i -n -e '/auto .*/,$p' /tmp/contrail-interfaces-bottom" - - "cat /tmp/contrail-interfaces-top /tmp/contrail-interfaces-bottom > /etc/network/interfaces" - -#- name: get last ip address -# shell: expr substr `cat /etc/hostname` 5 1 -# register: lastip - -- name: "configure interface" - lineinfile: - dest: "/etc/network/interfaces" - line: "{{ item }}" - state: "present" - with_items: - - "auto {{ contrail_vhost_device }}" - - "iface {{ contrail_vhost_device }} inet manual" - - "\tpre-up ifconfig {{ contrail_vhost_device }} up" - - "\tpost-down ifconfig {{ contrail_vhost_device }} down" - - "auto vhost0" - - "iface vhost0 inet static" - - "\tpre-up /opt/contrail/bin/if-vhost0" - - "\tnetwork_name application" - - "\taddress {{ contrail_vhost_address }}" - - "\tnetmask {{ contrail_vhost_netmask }}" - -################################################################################## - -- name: "copy vrouter script to compute" - template: - src: "../../templates/vrouter-functions.sh" - dest: "/opt/contrail/bin/vrouter-functions.sh" - -- name: "load vrouter driver" - command: su -s /bin/sh -c "insmod /var/lib/dkms/vrouter/2.21/build/vrouter.ko" - ignore_errors: true - -- name: "run vhost0 script" - command: su -s /bin/sh -c "/opt/contrail/bin/if-vhost0" - ignore_errors: true - -################################################################################## - -- name: "delete temporary files" - file: - dest: "{{ item }}" - state: "absent" - with_items: - - "/tmp/contrail-interfaces-top" - - "/tmp/contrail-interfaces-bottom" - -################################################################################## - -- name: "fix up contrail vrouter nodemgr config" - ini_file: - dest: "/etc/contrail/contrail-vrouter-nodemgr.conf" - section: "DISCOVERY" - option: "server" - value: "{{ contrail_haproxy_address }}" - - -################################################################################## -########################### restart vrouter services ########################### - -- name: "restart supervisor service" - service: - name: "supervisor" - state: "restarted" - -- name: "restart vrouter nodemgr" - shell: ps aux | grep contrail-nodemgr | grep -v grep | awk '{print $2}' | xargs kill -9; - -- name: "restart vrouter agent" - service: - name: "contrail-vrouter-agent" - state: "restarted" - - -################################################################################## - - -- name: "restart libvirt bin" - service: - name: "libvirt-bin" - state: "restarted" - -#- name: "set value of nova to nova config" -# template: -# src: "provision/nova.j2" -# dest: "/etc/nova/nova.conf" -# when: install_nova - -#- name: "delete values from nova config" -# ini_file: -# dest: "/etc/nova/nova.conf" -# section: "{{ item.section }}" -# option: "{{ item.option }}" -# with_items: -# - { section: "DEFAULT", option: "quantum_auth_strategy" } -# - { section: "DEFAULT", option: "quantum_admin_auth_url" } -# - { section: "DEFAULT", option: "quantum_admin_tenant_name" } -# - { section: "DEFAULT", option: "quantum_admin_username" } -# - { section: "DEFAULT", option: "quantum_admin_password" } -# - { section: "DEFAULT", option: "quantum_url" } - -#- name: "set values of neutron to nova config" -# ini_file: -# dest: "/etc/nova/nova.conf" -# section: "{{ item.section }}" -# option: "{{ item.option }}" -# value: "{{ item.value }}" -# state: "present" -# with_items: -# - { section: "DEFAULT", option: "neutron_admin_auth_url", value: "http://{{ contrail_keystone_address }}:5000/v2.0" } -# - { section: "DEFAULT", option: "neutron_admin_username", value: "neutron" } -# - { section: "DEFAULT", option: "neutron_admin_password", value: "{{ contrail_admin_password }}" } -# - { section: "DEFAULT", option: "neutron_admin_tenant_name", value: "service" } -# - { section: "DEFAULT", option: "neutron_url", value: "http://{{ contrail_haproxy_address }}:9696/" } -# - { section: "DEFAULT", option: "neutron_url_timeout", value: "300" } -# - { section: "DEFAULT", option: "network_api_class", value: "nova.network.neutronv2.api.API" } -# - { section: "DEFAULT", option: "libvirt_vif_driver", value: "nova_contrail_vif.contrailvif.VRouterVIFDriver" } - -- name: "set values to nova config" - ini_file: - dest: "/etc/nova/nova.conf" - section: "{{ item.section }}" - option: "{{ item.option }}" - value: "{{ item.value }}" - with_items: - - { section: "DEFAULT", option: "network_api_class", value: "nova_contrail_vif.contrailvif.ContrailNetworkAPI" } - - - -####################################################################### -###################### nova plugin workaround ####################### -####################################################################### - -#- name: "copy nova plugs on compute" -# copy: -# src: "../../templates/nova_contrail_vif.tar.gz" -# dest: "/opt/nova_contrail_vif.tar.gz" - -- name: get image http server - shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf - register: http_server - -- name: download nova plugin package - get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/open-contrail/{{ nova_plugin }}" dest=/opt/ - -- name: "unzip nova plugs" - command: su -s /bin/sh -c "tar xzf /opt/nova_contrail_vif.tar.gz -C /opt/" - -- name: "remove original nova plugs" - shell: rm -rf /usr/lib/python2.7/dist-packages/nova_contrail_vif/ - -- name: "use new nova plugs" - shell: mv /opt/nova_contrail_vif/ /usr/lib/python2.7/dist-packages/nova_contrail_vif/ - -################################################# - -- name: "restart nova compute" - service: - name: "nova-compute" - state: "restarted" - -- name: "add vrouter to contrail" - shell: "python /opt/contrail/utils/provision_vrouter.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --openstack_ip {{ contrail_keystone_address }} --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }}" - -#- name: "reboot Server" -# shell: "shutdown -r now" -# async: 0 -# poll: 0 -# ignore_errors: true -# notify: Wait for server to come back -# -#handlers: -#- name: "Wait for server to come back" -# local_action: -# module: wait_for -# host={{ inventory_hostname }} -# port=22 -# delay=30 -# timeout=600 diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml deleted file mode 100755 index 615ac281..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-config.yml +++ /dev/null @@ -1,350 +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 -############################################################################## ---- -#- hosts: config -# sudo: yes -# tasks: -- name: "enable supervisor config" - file: - path: "/etc/init/supervisor-config.override" - state: "absent" - -- name: "enable neutron server" - file: - path: "/etc/init/neutron-server.override" - state: "absent" - -# Compass is using this -#- name: "enable haproxy" -# replace: -# dest: "/etc/default/haproxy" -# regexp: "^ENABLED\\s*=.*$" -# replace: "ENABLED=1" - -# Compass is using this -#- name: "modify haproxy global configuration" -# lineinfile: -# dest: "/etc/haproxy/haproxy.cfg" -# regexp: "{{ item.regexp }}" -# line: "{{ item.line }}" -# insertafter: "^global" -# with_items: -# - { regexp: "^\\s*tune.bufsize", line: "\ttune.bufsize 16384" } -# - { regexp: "^\\s*tune.maxrewrite", line: "\ttune.maxrewrite 1024" } - -#chenshuai, add later -#- name: "delete haproxy configuration for contrail" -# shell: "sed -i -e '/^#contrail-marker-start/,/^#contrail-marker-end/d' /etc/haproxy/haproxy.cfg" - -#chenshuai, add later -#- name: "create haproxy configuration for contrail" -# template: -# src: "provision/haproxy-contrail-cfg.j2" -# src: "../../templates/provision/haproxy-contrail-cfg.j2" -# dest: "/tmp/haproxy-contrail.cfg" - -#chenshuai, add later -#- name: "combination of the haproxy configuration" -# shell: "cat /tmp/haproxy-contrail.cfg >> /etc/haproxy/haproxy.cfg" - -#chenshuai, add later -#- name: "delete temporary configuration file" -# file: -# dest: "/tmp/haproxy-contrail.cfg" -# state: "absent" - -#chenshuai, add later -#- name: "restart haproxy" -# service: -# name: "haproxy" -# state: "restarted" - -# Compass is using this -#- name: "create keepalived configuration" -# template: -# src: "../../templates/provision/keepalived-conf.j2" -# dest: "/etc/keepalived/keepalived.conf" -# with_indexed_items: groups['opencontrail_config'] -# when: contrail_keepalived and item.1 == inventory_hostname - -#- name: "restart keepalived" -# service: -# name: "keepalived" -# state: "restarted" -# when: contrail_keepalived - -- name: "node-common" - include: -node-common.yml - -- name: "fix up contrail keystone auth config" - template: - src: "../../templates/provision/contrail-keystone-auth-conf.j2" - dest: "/etc/contrail/contrail-keystone-auth.conf" - -- name: "fix up ifmap server log4j properties" - template: - src: "../../templates/provision/ifmap-log4j-properties.j2" - dest: "/etc/ifmap-server/log4j.properties" - -- name: "fix up ifmap server authorization properties" - template: - src: "../../templates/provision/ifmap-authorization-properties.j2" - dest: "/etc/ifmap-server/authorization.properties" - -- name: "fix up ifmap server basicauthusers properties" - template: - src: "../../templates/provision/ifmap-basicauthusers-properties.j2" - dest: "/etc/ifmap-server/basicauthusers.properties" - -- name: "fix up ifmap server publisher properties" - template: - src: "../../templates/provision/ifmap-publisher-properties.j2" - dest: "/etc/ifmap-server/publisher.properties" - -- name: "fix up contrail api config" - template: - src: "../../templates/provision/contrail-api-conf.j2" - dest: "/etc/contrail/contrail-api.conf" - -- name: "fix up contrail api supervisord config" - template: - src: "../../templates/provision/contrail-api-supervisord-conf.j2" - dest: "/etc/contrail/supervisord_config_files/contrail-api.ini" - -- name: "modify contrail api init script" - lineinfile: - dest: "/etc/init.d/contrail-api" - regexp: "supervisorctl -s unix:///tmp/supervisord_config.sock" - line: "supervisorctl -s unix:///tmp/supervisord_config.sock ${1} `basename ${0}:0`" - -- name: "fix up contrail schema config" - template: - src: "../../templates/provision/contrail-schema-conf.j2" - dest: "/etc/contrail/contrail-schema.conf" - -- name: "fix up contrail device manager config" - template: - src: "../../templates/provision/contrail-device-manager-conf.j2" - dest: "/etc/contrail/contrail-device-manager.conf" - -- name: "fix up contrail svc monitor config" - template: - src: "../../templates/provision/contrail-svc-monitor-conf.j2" - dest: "/etc/contrail/contrail-svc-monitor.conf" - -- name: "fix up contrail discovery supervisord config" - template: - src: "../../templates/provision/contrail-discovery-supervisord-conf.j2" - dest: "/etc/contrail/supervisord_config_files/contrail-discovery.ini" - -- name: "fix up contrail discovery config" - template: - src: "../../templates/provision/contrail-discovery-conf.j2" - dest: "/etc/contrail/contrail-discovery.conf" - -- name: "modify contrail discovery init script" - lineinfile: - dest: "/etc/init.d/contrail-discovery" - regexp: "supervisorctl -s unix:///tmp/supervisord_config.sock" - line: "supervisorctl -s unix:///tmp/supervisord_config.sock ${1} `basename ${0}:0`" - -- name: "fix up contrail vnc api library config" - template: - src: "../../templates/provision/contrail-vnc-api-lib-ini.j2" - dest: "/etc/contrail/vnc_api_lib.ini" - -- name: "fix up contrail config nodemgr config" - ini_file: - dest: "/etc/contrail/contrail-config-nodemgr.conf" - section: "DISCOVERY" - option: "server" - value: "{{ contrail_haproxy_address }}" - -- name: "fix up contrail sudoers" - template: - src: "../../templates/provision/contrail-sudoers.j2" - dest: "/etc/sudoers.d/contrail_sudoers" - mode: 0440 - -- name: "create directory for neutron plugins" - file: - dest: "/etc/neutron/plugins/opencontrail" - state: "directory" - -- name: "fix up contrail plugin for nuetron" - template: - src: "../../templates/provision/neutron-contrail-plugin-ini.j2" - dest: "/etc/neutron/plugins/opencontrail/ContrailPlugin.ini" - -- name: "modify neutron server configuration" - lineinfile: - dest: "/etc/default/neutron-server" - regexp: "NEUTRON_PLUGIN_CONFIG=" - line: "NEUTRON_PLUGIN_CONFIG=\"/etc/neutron/plugins/opencontrail/ContrailPlugin.ini\"" - -#- name: "change owner neutron log directory" -# file: -# dest: "/var/log/neutron" -# state: "directory" -# owner: "neutron" -# group: "neutron" -# recurse: yes - -- name: "set values to neutron config" - ini_file: - dest: "/etc/neutron/neutron.conf" - section: "{{ item.section }}" - option: "{{ item.option }}" - value: "{{ item.value }}" - with_items: -# - { section: "DEFAULT", option: "bind_port", value: "9697" } -# - { section: "DEFAULT", option: "auth_strategy", value: "keystone" } -# - { section: "DEFAULT", option: "allow_overlapping_ips", value: "True" } - - { section: "DEFAULT", option: "core_plugin", value: "neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2" } - - { section: "DEFAULT", option: "api_extensions_path", value: "/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions" } -# - { section: "DEFAULT", option: "rabbit_host", value: "{{ contrail_haproxy_address }}" } -# - { section: "DEFAULT", option: "rabbit_port", value: "5673" } -# - { section: "DEFAULT", option: "service_plugins", value: "neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin" } - - { section: "DEFAULT", option: "service_plugins", value: " " } - - { section: "DEFAULT", option: "notify_nova_on_port_data_changes", value: "False" } - - { section: "service_providers", option: "service_provider", value: "LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default" } - - { section: "quotas", option: "quota_driver", value: "neutron_plugin_contrail.plugins.opencontrail.quota.driver.QuotaDriver" } -# - { section: "quotas", option: "quota_network", value: "-1" } -# - { section: "quotas", option: "quota_subnet", value: "-1" } -# - { section: "quotas", option: "quota_port", value: "-1" } -# - { section: "keystone_authtoken", option: "admin_tenant_name", value: "admin" } -# - { section: "keystone_authtoken", option: "admin_user", value: "{{ contrail_admin_user }}" } -# - { section: "keystone_authtoken", option: "admin_password", value: "{{ contrail_admin_password }}" } -# - { section: "keystone_authtoken", option: "auth_host", value: "{{ contrail_keystone_address }}" } -# - { section: "keystone_authtoken", option: "auth_protocol", value: "http" } - -#- name: "add respawn to neutron server config" -# lineinfile: -# dest: "/etc/init/neutron-server.conf" -# line: "respawn" -# insertbefore: "pre-start script" - -#- name: "add respawn limit to neutron server config" -# lineinfile: -# dest: "/etc/init/neutron-server.conf" -# line: "respawn limit 10 90" -# insertafter: "respawn" - -- name: "restart supervisor config" - service: - name: "supervisor-config" - state: "restarted" - - - -########################################################### -############# neutron plugins workaround ################## -########################################################### - -#- name: "copy neutron plugs on controller" -# copy: -# src: "../../templates/neutron_plugin_contrail.tar.gz" -# dest: "/opt/neutron_plugin_contrail.tar.gz" - -- name: get image http server - shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf - register: http_server - -- name: download neutron_plugin_contrail package - get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/open-contrail/{{ neutron_plugin }}" dest=/opt/ - -- name: "unzip neutron plugs" - command: su -s /bin/sh -c "tar xzf /opt/neutron_plugin_contrail.tar.gz -C /opt/" - -- name: "remove original neutron plugs" - shell: rm -rf /usr/lib/python2.7/dist-packages/neutron_plugin_contrail/ - -- name: "use new neutron plugs" - shell: mv /opt/neutron_plugin_contrail/ /usr/lib/python2.7/dist-packages/neutron_plugin_contrail/ - -########################################################### - - - -- name: "restart neutron-server" - service: - name: "neutron-server" - state: "restarted" - -# Compass configured -#- name: "add neutron service" -# shell: "keystone service-get 'neutron' || keystone service-create --name 'neutron' --type 'network' --description 'Neutron Network Service'" -# environment: -# OS_AUTH_URL: "http://{{ contrail_keystone_address }}:35357/v2.0" -# OS_USERNAME: "{{ contrail_admin_user }}" -# OS_PASSWORD: "{{ contrail_admin_password }}" -# OS_TENANT_NAME: "admin" -# run_once: yes -# when: keystone_provision -# -# -# Compass configured -#- name: "add neutron endpoint" -# shell: "keystone endpoint-list | grep -q $(keystone service-get 'neutron' | grep '| *id *|' | awk '{print $4}') || keystone endpoint-create --region 'RegionOne' --service 'neutron' --publicurl 'http://{{ contrail_haproxy_address }}:9696' --internal 'http://{{ contrail_haproxy_address }}:9696' --adminurl 'http://{{ contrail_haproxy_address }}:9696'" -# environment: -# OS_AUTH_URL: "http://{{ contrail_keystone_address }}:35357/v2.0" -# OS_USERNAME: "{{ contrail_admin_user }}" -# OS_PASSWORD: "{{ contrail_admin_password }}" -# OS_TENANT_NAME: "admin" -# run_once: yes -# when: keystone_provision -# -#- name: "add neutron user" -# keystone_user: -# user: "neutron" -# password: "{{ contrail_admin_password }}" -# email: "neutron@example.com" -# tenant: "service" -# endpoint: "http://{{ contrail_keystone_address }}:35357/v2.0" -# login_user: "{{ contrail_admin_user }}" -# login_password: "{{ contrail_admin_password }}" -# login_tenant_name: "admin" -# run_once: yes -# when: keystone_provision -# -#- name: "apply role to user" -# keystone_user: -# tenant: "service" -# user: "neutron" -# role: "admin" -# endpoint: "http://{{ contrail_keystone_address }}:35357/v2.0" -# login_user: "{{ contrail_admin_user }}" -# login_password: "{{ contrail_admin_password }}" -# login_tenant_name: "admin" -# run_once: yes -# when: keystone_provision - - - -#- name: "set values to nova config" -# ini_file: -# dest: "/etc/nova/nova.conf" -# section: "{{ item.section }}" -# option: "{{ item.option }}" -# value: "{{ item.value }}" -# with_items: -# - { section: "DEFAULT", option: "network_api_class", value: "nova_contrail_vif.contrailvif.ContrailNetworkAPI" } - - -#- name: "restart nova-server" -# service: -# name: "{{ item }}" -# state: "restarted" -# with_items: -# - nova-api -# - nova-cert -# - nova-conductor -# - nova-consoleauth -# - nova-novncproxy -# - nova-scheduler diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml deleted file mode 100755 index e719a461..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-control.yml +++ /dev/null @@ -1,69 +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 -############################################################################## ---- -#- hosts: control -# sudo: yes -# tasks: -- name: "enable supervisor control" - file: - path: "/etc/init/supervisor-control.override" - state: "absent" - -- name: "enable supervisor dns" - file: - path: "/etc/init/supervisor-dns.override" - state: "absent" - -- name: "modify ifmap server basicauthusers properties for control" - lineinfile: - dest: "/etc/ifmap-server/basicauthusers.properties" -# line: "{{ hostvars[item]['contrail_address' ] }}:{{ hostvars[item]['contrail_address' ] }}" - line: "{{ ip_settings[item]['br-prv']['ip'] }}:{{ ip_settings[item]['br-prv']['ip'] }}" - with_items: groups['opencontrail'] - -- name: "modify ifmap server basicauthusers properties for dns" - lineinfile: - dest: "/etc/ifmap-server/basicauthusers.properties" -# line: "{{ hostvars[item]['contrail_address' ] }}.dns:{{ hostvars[item]['contrail_address' ] }}.dns" - line: "{{ ip_settings[item]['br-prv']['ip'] }}.dns:{{ ip_settings[item]['br-prv']['ip'] }}.dns" - with_items: groups['opencontrail'] - -- name: "node-common" - include: -node-common.yml - -- name: "fix up contrail control config" - template: - src: "../../templates/provision/contrail-control-conf.j2" - dest: "/etc/contrail/contrail-control.conf" - -- name: "fix up contrail dns config" - template: - src: "../../templates/provision/contrail-dns-conf.j2" - dest: "/etc/contrail/contrail-dns.conf" - -- name: "fix up contrail control nodemgr config" - ini_file: - dest: "/etc/contrail/contrail-control-nodemgr.conf" - section: "DISCOVERY" - option: "server" - value: "{{ contrail_haproxy_address }}" - -- name: "modify dns configuration" - replace: - dest: "/etc/contrail/dns/{{ item }}" - regexp: "secret \"secret123\"" - replace: "secret \"xvysmOR8lnUQRBcunkC6vg==\"" - with_items: - - "contrail-rndc.conf" - - "contrail-named.conf" - -- name: "restart supervisor control" - service: - name: "supervisor-control" - state: "restarted" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml deleted file mode 100755 index 9c99270d..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-database.yml +++ /dev/null @@ -1,209 +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 -############################################################################## ---- -#- hosts: database -# sudo: yes -# tasks: - - -- name: "enable supervisor database" -# sudo: True - file: - path: "/etc/init/supervisor-database.override" - state: "absent" - - -- name: "-node-common" -# sudo: True - include: -node-common.yml - - -- name: "update hosts" -# sudo: True - lineinfile: - dest: "/etc/hosts" -# regexp: "^{{ contrail_address }}\t{{ ansible_hostname }}( .*)?$" -# line: "{{ contrail_address }}\t{{ ansible_hostname }}\\1" - regexp: "^{{ contrail_address }}\t{{ inventory_hostname }}( .*)?$" - line: "{{ contrail_address }}\t{{ inventory_hostname }}\\1" - backrefs: yes - - -- name: "make directory for contrail analytics" -# sudo: True - file: - path: "/var/lib/cassandra/data/ContrailAnalytics" - state: "directory" - - -- name: "modify cassandra conf" -# sudo: True - lineinfile: - dest: "/etc/cassandra/cassandra.yaml" - regexp: "{{ item.regexp }}" - line: "{{ item.line }}" - with_items: - - { regexp: "^(#(\\s*)?)?listen_address:", line: "listen_address: {{ contrail_address }}"} - - { regexp: "^(#(\\s*)?)?cluster_name:", line: "cluster_name: \"Contrail\"" } - - { regexp: "^(#(\\s*)?)?rpc_address:", line: "rpc_address: {{ contrail_address }}" } - - { regexp: "^(#(\\s*)?)?num_tokens:", line: "num_tokens: 256" } - - { regexp: "^(#(\\s*)?)?initial_token:", line: "# initial_token:" } - - - -- name: "set first database host seed" -# sudo: True - set_fact: -# dbseeds: "{{ hostvars[item.1][ contrail_address ] }}" - dbseeds: "{{ ip_settings[item.1]['br-prv']['ip'] }}" - with_indexed_items: groups['opencontrail'] - when: item.0 == 0 - - - - - -- name: "set second database host seed" -# sudo: True - set_fact: -# dbseeds: "{{ dbseeds }},{{ hostvars[item.1]['contrail_address'] }}" - dbseeds: "{{ dbseeds }},{{ ip_settings[item.1]['br-prv']['ip'] }}" - with_indexed_items: groups['opencontrail'] - when: item.0 == 1 - - -- name: "modify seeds list in cassandra conf" -# sudo: True - replace: - dest: "/etc/cassandra/cassandra.yaml" - regexp: "- seeds:.*$" - replace: "- seeds: {{ dbseeds }}" - - -- name: "modify cassandra env" -# sudo: True - replace: - dest: "/etc/cassandra/cassandra-env.sh" - regexp: "{{ item.regexp }}" - replace: "{{ item.replace }}" - with_items: - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -XX:\\+PrintGCDetails\"", replace: "JVM_OPTS=\"$JVM_OPTS -XX:+PrintGCDetails\"" } - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -Xss\\d+k\"", replace: "JVM_OPTS=\"$JVM_OPTS -Xss512k\"" } - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -XX:\\+PrintGCDateStamps\"", replace: "JVM_OPTS=\"$JVM_OPTS -XX:+PrintGCDateStamps\"" } - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -XX:\\+PrintHeapAtGC\"", replace: "JVM_OPTS=\"$JVM_OPTS -XX:+PrintHeapAtGC\"" } - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -XX:\\+PrintTenuringDistribution\"", replace: "JVM_OPTS=\"$JVM_OPTS -XX:+PrintTenuringDistribution\"" } - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -XX:\\+PrintGCApplicationStoppedTime\"", replace: "JVM_OPTS=\"$JVM_OPTS -XX:+PrintGCApplicationStoppedTime\"" } - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -XX:\\+PrintPromotionFailure\"", replace: "JVM_OPTS=\"$JVM_OPTS -XX:+PrintPromotionFailure\"" } - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -XX:PrintFLSStatistics=1\"", replace: "JVM_OPTS=\"$JVM_OPTS -XX:PrintFLSStatistics=1\"" } - - { regexp: "(#(\\s*)?)?JVM_OPTS=\"\\$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date \\+%s`\\.log\"", replace: "JVM_OPTS=\"$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log\"" } - - -- name: "modify zookeeper conf" -# sudo: True - lineinfile: - dest: "/etc/zookeeper/conf/zoo.cfg" - line: "{{ item }}" - with_items: - - "maxSessionTimeout=120000" - - "autopurge.purgeInterval=3" - - -- name: "modify zookeeper log4j properties" -# sudo: True - lineinfile: - dest: "/etc/zookeeper/conf/log4j.properties" - regexp: "(log4j.appender.ROLLINGFILE.MaxBackupIndex=.*)$" - line: "\\1" - backrefs: yes - - -- name: "add server addresses to zookeeper config" -# sudo: True - lineinfile: - dest: "/etc/zookeeper/conf/zoo.cfg" - regexp: "server.{{ item.0 + 1 }}=" -# line: "server.{{ item.0 + 1 }}={{ hostvars[item.1]['contrail_address'] }}:2888:3888" - line: "server.{{ item.0 + 1 }}={{ ip_settings[item.1]['br-prv']['ip'] }}:2888:3888" - with_indexed_items: groups['opencontrail'] - - -- name: "set zookeeper unique id" -# sudo: True - template: - src: "../../templates/provision/zookeeper-unique-id.j2" - dest: "/var/lib/zookeeper/myid" - with_indexed_items: groups['opencontrail'] - when: item.1 == inventory_hostname - - -- name: "remove kafka ini file" -# sudo: True - file: - path: "/etc/contrail/supervisord_database_files/kafka.ini" - state: "absent" - - -- name: "set first zookeeper host address" -# sudo: True - set_fact: -# zkaddrs: "{{ hostvars[item.1]['contrail_address'] }}:2181" - zkaddrs: "{{ ip_settings[item.1]['br-prv']['ip'] }}:2181" - with_indexed_items: groups['opencontrail'] - when: item.0 == 0 - - -- name: "set second or more zookeeper host addresses" -# sudo: True - set_fact: -# zkaddrs: "{{ zkaddrs }},{{ hostvars[item.1]['contrail_address'] }}:2181" - zkaddrs: "{{ zkaddrs }},{{ ip_settings[item.1]['br-prv']['ip'] }}:2181" - with_indexed_items: groups['opencontrail'] - when: item.0 > 0 - - -- name: "modify zookeeper host addresses in kafka properties" -# sudo: True - lineinfile: - dest: "/usr/share/kafka/config/server.properties" - regexp: "zookeeper.connect=" - line: "zookeeper.connect={{ zkaddrs }}" - - -- name: "modify kafka properties" -# sudo: True - lineinfile: - dest: "/usr/share/kafka/config/server.properties" - regexp: "default.replication.factor=" - line: "default.replication.factor=2" - - -- name: "fix up contrail database nodemgr config" -# sudo: True - ini_file: - dest: "/etc/contrail/contrail-database-nodemgr.conf" - section: "{{ item.section }}" - option: "{{ item.option }}" - value: "{{ item.value }}" - with_items: - - { section: "DEFAULT", option: "hostip", value: "{{ contrail_address }}" } - - { section: "DISCOVERY", option: "server", value: "{{ contrail_haproxy_address }}" } - - -- name: "restart zookeeper" -# sudo: True - service: - name: "zookeeper" - state: "restarted" - - -- name: "restart supervisor database" -# sudo: True - service: - name: "supervisor-database" - state: "restarted" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-increase-limits.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-increase-limits.yml deleted file mode 100755 index 89a4966f..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-increase-limits.yml +++ /dev/null @@ -1,60 +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 -############################################################################## ---- -#- hosts: [database, config, control, collector] -# sudo: yes -# tasks: -- name: "delete line" -# sudo: True - lineinfile: - dest: "/etc/limits.conf" - regexp: "^root\\s*soft\\s*nproc\\s*.*" - state: "absent" - -- name: "check EOF" -# sudo: True - lineinfile: - dest: "/etc/security/limits.conf" - regexp: "^# End of file" - line: "# End of file" - -- name: "add lines" -# sudo: True - lineinfile: - dest: "/etc/security/limits.conf" - regexp: "{{ item.regexp }}" - line: "{{ item.line }}" - insertbefore: "^# End of file" - with_items: - - { regexp: "^root\\s*hard\\s*nofile\\s*.*", line: "root hard nofile 65535" } - - { regexp: "^root\\s*soft\\s*nofile\\s*.*", line: "root soft nofile 65535" } - - { regexp: "^\\*\\s*hard\\s*nofile\\s*.*", line: "* hard nofile 65535" } - - { regexp: "^\\*\\s*soft\\s*nofile\\s*.*", line: "* soft nofile 65535" } - - { regexp: "^\\*\\s*hard\\s*nproc\\s*.*", line: "* hard nproc 65535" } - - { regexp: "^\\*\\s*soft\\s*nproc\\s*.*", line: "* soft nproc 65535" } - -- name: change value of sysctl fs.file-max -# sudo: True - sysctl: - name: "fs.file-max" - value: "65535" - -- name: "find supervisord conf files" -# sudo: True - shell: "find /etc/contrail -name supervisor*.conf -type f" - register: supervisordconfs - changed_when: no - -- name: "modify supervisord conf" -# sudo: True - replace: - dest: "{{ item }}" - regexp: "^minfds=\\d*" - replace: "minfds=10240" - with_items: supervisordconfs.stdout_lines diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-rabbitmq.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-rabbitmq.yml deleted file mode 100644 index d3426590..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-rabbitmq.yml +++ /dev/null @@ -1,87 +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 -############################################################################## ---- -#- hosts: config -# sudo: yes -# tasks: -- name: turn off rabbitmq server on control node - shell: sed -i '/rabbitmq-server/d' /opt/service ; - -- name: "start supervisor support service" - service: - name: "supervisor-support-service" - state: "started" - -- name: "stop rabbitmq server via supervisor" - supervisorctl: - name: "rabbitmq-server" - state: "stopped" - server_url: "unix:///tmp/supervisord_support_service.sock" - -- include: -rabbitmq-stop.yml - -- name: "update hosts" - lineinfile: - dest: "/etc/hosts" - line: "{{ ip_settings[item]['br-prv']['ip'] }}\t{{ hostvars[item]['ansible_hostname'] }} {{ hostvars[item]['ansible_hostname'] }}-ctrl" - with_items: groups['opencontrail'] - -- name: "fix up rabbitmq env" - template: - src: "../../templates/provision/rabbitmq-env-conf.j2" - dest: "/etc/rabbitmq/rabbitmq-env.conf" - -- name: "fix up rabbitmq config for single node" - template: - src: "../../templates/provision/rabbitmq-conf-single.j2" - dest: "/etc/rabbitmq/rabbitmq.config" - when: groups['opencontrail'][1] is not defined - -- name: fix up rabbitmq config for multi nodes - template: - src: "../../templates/provision/rabbitmq-conf.j2" - dest: "/etc/rabbitmq/rabbitmq.config" - when: groups['opencontrail'][1] is defined - -- include: -rabbitmq-stop.yml - -#- name: "create cookie uuid temporary" -# local_action: -# module: "template" -# src: "templates/rabbitmq-cookie.j2" -# dest: "/tmp/tmp-rabbitmq-cookie" -# run_once: yes -# -#- name: "update cookie uuid" -# copy: -# src: "/tmp/tmp-rabbitmq-cookie" -# dest: "/var/lib/rabbitmq/.erlang.cookie" -# owner: "rabbitmq" -# group: "rabbitmq" -# mode: 0400 -# -#- name: "delete temporary cookie uuid" -# local_action: -# module: "file" -# dest: "/tmp/tmp-rabbitmq-cookie" -# state: "absent" -# run_once: yes - -- name: "start rabbitmq server" - service: - name: "rabbitmq-server" - state: "started" - -- name: add rabbitmq user - shell: > - rabbitmqctl add_user {{ RABBIT_USER }} {{ RABBIT_PASS }} ; - rabbitmqctl set_permissions {{ RABBIT_USER }} ".*" ".*" ".*" ; - -- name: "check rabbitmq server" - shell: netstat -lpen --tcp | grep beam | grep 5672; while [ $? -ne 0 ]; do sleep 10; netstat -lpen --tcp | grep beam | grep 5672; done diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-route.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-route.yml deleted file mode 100755 index 01687281..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-route.yml +++ /dev/null @@ -1,50 +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 -############################################################################## ---- -#- hosts: all -# sudo: yes -# tasks: -- name: "delete existing route file" -# sudo: True - file: - path: "/etc/network/if-up.d/routes" - state: absent - when: contrail_route - -- name: "create route file" -# sudo: True - file: - path: "/etc/network/if-up.d/routes" - owner: "root" - mode: 0755 - state: touch - when: contrail_route - - -- name: "add template" -# sudo: True - lineinfile: - dest: "/etc/network/if-up.d/routes" - line: "{{ item }}" - with_items: - - "#!/bin/bash" - - "[ \"$IFACE\" != {{ contrail_route[0].device }} ] && exit 0" - when: contrail_route - - -- name: "add static route" -# sudo: True - lineinfile: - dest: "/etc/network/if-up.d/routes" - line: "ip route add {{ item.ip }} via {{ item.gw }} dev {{ item.device }}" - state: "present" - with_items: - - "{{ contrail_route }}" - when: contrail_route - diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-toragent.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-toragent.yml deleted file mode 100755 index 3ae0bec9..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-toragent.yml +++ /dev/null @@ -1,85 +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 -############################################################################## ---- -#- hosts: tsn -# sudo: yes -# tasks: -- name: "create temporary directory for ssl files" - local_action: - module: "file" - dest: "/tmp/tmp-toragent-{{ item }}" - state: "directory" - with_items: - - "certs" - - "private" - run_once: yes - -- name: "create ssl files" - local_action: "shell openssl req -new -x509 -days 3650 -text -sha256 -newkey rsa:4096 -nodes -subj \"/C=US/ST=Global/O={{ item.1.vendor_name }}/CN={{ ansible_fqdn }}\" -keyout /tmp/tmp-toragent-private/tor.{{ item.0 }}.privkey.pem -out /tmp/tmp-toragent-certs/tor.{{ item.0 }}.cert.pem" - with_indexed_items: contrail_tor_agents - run_once: yes - -- name: "set tor agent list" - set_fact: - toragent_index: "{{ item.0 }}" - toragent_params: "{{ item.1 }}" - register: contrail_toragent_list - with_indexed_items: contrail_tor_agents - when: inventory_hostname in item.1.tsn_names - -- name: "fix up tor agent conf" - template: - src: "templates/contrail-tor-agent-conf.j2" - dest: "/etc/contrail/contrail-tor-agent-{{ item.ansible_facts.toragent_index }}.conf" - with_items: contrail_toragent_list.results - -- name: "fix up tor agent ini" - template: - src: "provision/contrail-tor-agent-ini.j2" - dest: "/etc/contrail/supervisord_vrouter_files/contrail-tor-agent-{{ item.ansible_facts.toragent_index }}.ini" - with_items: contrail_toragent_list.results - -- name: "copy init script" - shell: "cp /etc/init.d/contrail-vrouter-agent /etc/init.d/contrail-tor-agent-{{ item.ansible_facts.toragent_index }}" - with_items: contrail_toragent_list.results - -- name: "copy ssl certs" - copy: - src: "/tmp/tmp-toragent-certs/tor.{{ item.ansible_facts.toragent_index }}.cert.pem" - dest: "/etc/contrail/ssl/certs/tor.{{ item.ansible_facts.toragent_index }}.cert.pem" - with_items: contrail_toragent_list.results - -- name: "copy ssl private" - copy: - src: "/tmp/tmp-toragent-private/tor.{{ item.ansible_facts.toragent_index }}.privkey.pem" - dest: "/etc/contrail/ssl/private/tor.{{ item.ansible_facts.toragent_index }}.privkey.pem" - with_items: contrail_toragent_list.results - -- name: "copy ca cert" - copy: - src: "files/cacert.pem" - dest: "/etc/contrail/ssl/certs/cacert.pem" - -- name: "delete temporary directory" - local_action: - module: "file" - dest: "/tmp/tmp-toragent-{{ item }}" - state: "absent" - with_items: - - "certs" - - "private" - run_once: yes - -- name: "add tor agent to contrail" - shell: "python /opt/contrail/utils/provision_vrouter.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --openstack_ip {{ contrail_keystone_address }} --oper add --host_name {{ inventory_hostname }}-{{ item.ansible_facts.toragent_index }} --host_ip {{ contrail_address }} --router_type tor-agent" - with_items: contrail_toragent_list.results - -- name: "add device to contrail" - shell: "python /opt/contrail/utils/provision_physical_device.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --openstack_ip {{ contrail_keystone_address }} --oper add --device_name {{ item.ansible_facts.toragent_params.name }} --vendor_name {{ item.ansible_facts.toragent_params.vendor_name }} --product_name {{ item.ansible_facts.toragent_params.product_name }} --device_mgmt_ip {{ item.ansible_facts.toragent_params.address }} --device_tunnel_ip {{ item.ansible_facts.toragent_params.tunnel_address }} --device_tor_agent {{ inventory_hostname }}-{{ item.ansible_facts.toragent_index }} --device_tsn {{ inventory_hostname }}" - with_items: contrail_toragent_list.results diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml deleted file mode 100755 index 8bd6dc06..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-tsn.yml +++ /dev/null @@ -1,104 +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 -############################################################################## ---- -#- hosts: tsn -# sudo: yes -# tasks: - -- name: "enable supervisor vrouter" - file: - path: "/etc/init/supervisor-vrouter.override" - state: "absent" - -- include: -node-common.yml - -- name: "fix up vrouter nodemgr param" - template: - src: "provision/vrouter-nodemgr-param.j2" - dest: "/etc/contrail/vrouter_nodemgr_param" - -- name: "set contrail device name for ansible" - set_fact: - contrail_ansible_device: "ansible_{{ contrail_vhost_device }}" - -- name: "fix up default pmac" - template: - src: "provision/default-pmac.j2" - dest: "/etc/contrail/default_pmac" - -- name: "copy agent param config from template" - shell: "cp /etc/contrail/agent_param.tmpl /etc/contrail/agent_param" - -- name: "modify agent param config" - lineinfile: - dest: "/etc/contrail/agent_param" - regexp: "dev=__DEVICE__" - line: "dev={{ contrail_vhost_device }}" - -- name: "set vrouter agent mode" - set_fact: - contrail_vrouter_mode: "tsn" - -- name: "fix up contrail vrouter agent config" - template: - src: "../../templates/provision/contrail-vrouter-agent-conf.j2" - dest: "/etc/contrail/contrail-vrouter-agent.conf" - -- name: "delete lines for contrail interface" - shell: "{{ item }}" - with_items: - - "sed -e '/auto {{ contrail_vhost_device }}/,$d' /etc/network/interfaces > /tmp/contrail-interfaces-top" - - "sed -n -e '/auto {{ contrail_vhost_device }}/,$p' /etc/network/interfaces > /tmp/contrail-interfaces-bottom" - - "sed -i -e '/auto {{ contrail_vhost_device }}/d' /tmp/contrail-interfaces-bottom" - - "sed -i -n -e '/auto .*/,$p' /tmp/contrail-interfaces-bottom" - - "cat /tmp/contrail-interfaces-top /tmp/contrail-interfaces-bottom > /etc/network/interfaces" - -- name: "delete lines for vrouter interface" - shell: "{{ item }}" - with_items: - - "sed -e '/auto vhost0/,$d' /etc/network/interfaces > /tmp/contrail-interfaces-top" - - "sed -n -e '/auto vhost0/,$p' /etc/network/interfaces > /tmp/contrail-interfaces-bottom" - - "sed -i -e '/auto vhost0/d' /tmp/contrail-interfaces-bottom" - - "sed -i -n -e '/auto .*/,$p' /tmp/contrail-interfaces-bottom" - - "cat /tmp/contrail-interfaces-top /tmp/contrail-interfaces-bottom > /etc/network/interfaces" - -- name: "configure interface" - lineinfile: - dest: "/etc/network/interfaces" - line: "{{ item }}" - state: "present" - with_items: - - "auto {{ contrail_vhost_device }}" - - "iface {{ contrail_vhost_device }} inet manual" - - "\tpre-up ifconfig {{ contrail_vhost_device }} up" - - "\tpost-down ifconfig {{ contrail_vhost_device }} down" - - "auto vhost0" - - "iface vhost0 inet static" - - "\tpre-up /opt/contrail/bin/if-vhost0" - - "\tnetwork_name application" - - "\taddress {{ contrail_vhost_address }}" - - "\tnetmask {{ contrail_vhost_netmask }}" - -- name: "delete temporary files" - file: - dest: "{{ item }}" - state: "absent" - with_items: - - "/tmp/contrail-interfaces-top" - - "/tmp/contrail-interfaces-bottom" - -- name: "fix up contrail vrouter nodemgr config" - ini_file: - dest: "/etc/contrail/contrail-vrouter-nodemgr.conf" - section: "DISCOVERY" - option: "server" - value: "{{ contrail_haproxy_address }}" - -- name: "add tsn to contrail" - shell: "python /opt/contrail/utils/provision_vrouter.py --api_server_ip {{ contrail_haproxy_address }} --admin_user {{ contrail_admin_user }} --admin_password {{ contrail_admin_password }} --admin_tenant_name admin --openstack_ip {{ contrail_keystone_address }} --oper add --host_name {{ ansible_hostname }} --host_ip {{ contrail_address }} --router_type tor-service-node" diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml deleted file mode 100755 index 525f4334..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/provision/provision-webui.yml +++ /dev/null @@ -1,75 +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 -############################################################################## ---- -#- hosts: webui -# sudo: yes -# tasks: - -- name: "enable supervisor webui" - file: - path: "/etc/init/supervisor-webui.override" - state: "absent" - -- name: "redis-setup" - include: -redis-setup.yml - -- name: "node-common" - include: -node-common.yml - -- name: "set first cassandra host address" - set_fact: -# cassandra_addrs: "'{{ hostvars[item.1]['contrail_address'] }}'" - cassandra_addrs: "'{{ ip_settings[item.1]['br-prv']['ip'] }}'" - with_indexed_items: groups['opencontrail'] - when: item.0 == 0 - -- name: "set second or more cassandra host addresses" - set_fact: -# cassandra_addrs: "{{ cassandra_addrs }}, '{{ hostvars[item.1]['contrail_address'] }}'" - cassandra_addrs: "{{ cassandra_addrs }}, '{{ ip_settings[item.1]['br-prv']['ip'] }}'" - with_indexed_items: groups['opencontrail'] - when: item.0 > 0 - -- name: "modify webui global js" - lineinfile: - dest: "/etc/contrail/config.global.js" - regexp: "{{ item.regexp }}" - line: "{{ item.line }}" - with_items: - - { regexp: "^\\s*config.networkManager.ip", line: "config.networkManager.ip = '{{ contrail_haproxy_address }}';" } - - { regexp: "^\\s*config.imageManager.ip", line: "config.imageManager.ip = '{{ contrail_keystone_address }}';" } - - { regexp: "^\\s*config.computeManager.ip", line: "config.computeManager.ip = '{{ contrail_keystone_address }}';" } - - { regexp: "^\\s*config.identityManager.ip", line: "config.identityManager.ip = '{{ contrail_keystone_address }}';" } - - { regexp: "^\\s*config.storageManager.ip", line: "config.storageManager.ip = '{{ contrail_keystone_address }}';" } - - { regexp: "^\\s*config.cnfg.server_ip", line: "config.cnfg.server_ip = '{{ contrail_haproxy_address }}';" } - - { regexp: "^\\s*config.analytics.server_ip", line: "config.analytics.server_ip = '{{ contrail_haproxy_address }}';" } -# TODO: when I update ansibel version to 2.2, this playbook can't pass the test. ERROR log: "'cassandra_addrs' is undefined". -# - { regexp: "^\\s*config.cassandra.server_ips", line: "config.cassandra.server_ips = [{{ cassandra_addrs }}];" } - -- name: "modify webui userauth js" - lineinfile: - dest: "/etc/contrail/contrail-webui-userauth.js" - regexp: "{{ item.regexp }}" - line: "{{ item.line }}" - with_items: - - { regexp: "^\\s*auth.admin_user", line: "auth.admin_user = '{{ contrail_admin_user }}';" } - - { regexp: "^\\s*auth.admin_password", line: "auth.admin_password = '{{ contrail_admin_password }}';" } - - { regexp: "^\\s*auth.admin_tenant_name", line: "auth.admin_tenant_name = 'admin';" } - -- name: "create symbolic link from nodejs to node" - file: - src: "/usr/bin/node" - dest: "/usr/bin/nodejs" - state: "link" - -- name: "restart supervisor webui" - service: - name: "supervisor-webui" - state: "restarted" - diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/uninstall-openvswitch.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/uninstall-openvswitch.yml deleted file mode 100755 index 836cb78b..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/uninstall-openvswitch.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- name: del ovs bridge - shell: ovs-vsctl del-br br-int; ovs-vsctl del-br br-tun; ovs-vsctl del-br br-prv; - -- name: remove ovs and ovs-plugin daeman - shell: > - sed -i '/neutron-openvswitch-agent/d' /opt/service ; - sed -i '/openvswitch-switch/d' /opt/service ; - -- name: stop ovs and ovs-plugin - shell: service openvswitch-switch stop; service neutron-openvswitch-agent stop; - -- name: remove ovs and ovs-plugin files - shell: > - update-rc.d -f neutron-openvswitch-agent remove; - mv /etc/init.d/neutron-openvswitch-agent /home/neutron-openvswitch-agent; - mv /etc/init/neutron-openvswitch-agent.conf /home/neutron-openvswitch-agent.conf; - update-rc.d -f openvswitch-switch remove ; - mv /etc/init.d/openvswitch-switch /home/openvswitch-switch ; - mv /etc/init/openvswitch-switch.conf /home/openvswitch-switch.conf ; - update-rc.d -f neutron-ovs-cleanup remove ; - mv /etc/init.d/neutron-ovs-cleanup /home/neutron-ovs-cleanup ; - mv /etc/init/neutron-ovs-cleanup.conf /home/neutron-ovs-cleanup.conf ; - -- name: remove ovs kernel module - shell: rmmod vport_vxlan; rmmod openvswitch; - ignore_errors: True - -- name: copy recovery script - copy: src={{ item }} dest=/opt/setup_networks - with_items: -# - recover_network_opencontrail.py - - setup_networks_opencontrail.py - -#- name: recover external script -# shell: python /opt/setup_networks/recover_network_opencontrail.py - -- name: modify net-init - shell: sed -i 's/setup_networks.py/setup_networks_opencontrail.py/g' /etc/init.d/net_init - -- name: resolve dual NIC problem - shell: > - echo "net.ipv4.conf.all.arp_ignore=1" >> /etc/sysctl.conf ; - /sbin/sysctl -p ; - echo 1 > /proc/sys/net/ipv4/conf/all/arp_ignore ; - diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/install/override.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/install/override.j2 deleted file mode 100755 index 2905494b..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/install/override.j2 +++ /dev/null @@ -1 +0,0 @@ -manual diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 deleted file mode 100755 index 21fb733b..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-analytics-api-conf.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[DEFAULTS] -host_ip = {{ contrail_haproxy_address }} -rest_api_ip = {{ contrail_haproxy_address }} -rest_api_port = 8081 -#cassandra_server_list = {% for cur_host in groups['controller'] %}{{ ip_settings[cur_host]['mgmt']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} -#chenshuai: This kind of written is also correct, but the following is better, this as record -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - -collectors = {{ contrail_haproxy_address }}:8086 -http_server_port = 8090 -log_file = /var/log/contrail/contrail-analytics-api.log -log_level = SYS_NOTICE -log_local = 1 - -# Time-to-live in hours of the various data stored by collector into -# cassandra -# analytics_config_audit_ttl, if not set (or set to -1), defaults to analytics_data_ttl -# analytics_statistics_ttl, if not set (or set to -1), defaults to analytics_data_ttl -# analytics_flow_ttl, if not set (or set to -1), defaults to analytics_statsdata_ttl -analytics_data_ttl = 48 -analytics_config_audit_ttl = -1 -analytics_statistics_ttl = -1 -analytics_flow_ttl = -1 - -[DISCOVERY] -disc_server_ip = {{ contrail_haproxy_address }} -disc_server_port = 5998 - -[REDIS] -redis_server_port = 6379 -redis_query_port = 6379 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2 deleted file mode 100755 index 19004ce3..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-conf.j2 +++ /dev/null @@ -1,29 +0,0 @@ -[DEFAULTS] -listen_ip_addr = {{ contrail_haproxy_address }} -listen_port = 8082 -ifmap_server_ip = {{ contrail_haproxy_address }} -ifmap_server_port = 8443 -ifmap_username = api-server -ifmap_password = api-server -zk_server_ip = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:2181{% if not loop.last %}, {% endif %}{% endfor %} - -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - -disc_server_ip = {{ contrail_haproxy_address }} -disc_server_port = 5998 -rabbit_server = {{ contrail_haproxy_address }} -rabbit_port = 5672 -rabbit_user = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} -multi_tenancy = True -list_optimization_enabled = True -log_file = /var/log/contrail/contrail-api.log -log_level = SYS_NOTICE -log_local = 1 -auth = keystone - -[SECURITY] -use_certs = False -keyfile = /etc/contrail/ssl/private_keys/apiserver_key.pem -certfile = /etc/contrail/ssl/certs/apiserver.pem -ca_certs = /etc/contrail/ssl/certs/ca.pem diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-supervisord-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-supervisord-conf.j2 deleted file mode 100755 index ad3e0387..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-api-supervisord-conf.j2 +++ /dev/null @@ -1,12 +0,0 @@ -[program:contrail-api] -command=/usr/bin/contrail-api --conf_file /etc/contrail/contrail-api.conf --conf_file /etc/contrail/contrail-keystone-auth.conf --worker_id %(process_num)s -numprocs=1 -process_name=%(process_num)s -redirect_stderr=true -stdout_logfile=/var/log/contrail/contrail-api-%(process_num)s-stdout.log -stderr_logfile=/dev/null -priority=440 -autostart=true -killasgroup=true -stopsignal=KILL -exitcodes=0 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-collector-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-collector-conf.j2 deleted file mode 100755 index 11509603..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-collector-conf.j2 +++ /dev/null @@ -1,86 +0,0 @@ -[DEFAULT] -# Everything in this section is optional - -# Time-to-live in hours of the various data stored by collector into -# cassandra -# analytics_config_audit_ttl, if not set (or set to -1), defaults to analytics_data_ttl -# analytics_statistics_ttl, if not set (or set to -1), defaults to analytics_data_ttl -# analytics_flow_ttl, if not set (or set to -1), defaults to analytics_statsdata_ttl -analytics_data_ttl = 48 -analytics_config_audit_ttl = -1 -analytics_statistics_ttl = -1 -analytics_flow_ttl = -1 - -# IP address and port to be used to connect to cassandra. -# Multiple IP:port strings separated by space can be provided -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - - -# IP address and port to be used to connect to kafka. -# Multiple IP:port strings separated by space can be provided -kafka_broker_list = - -# IP address of analytics node. Resolved IP of 'hostname' -hostip = {{ contrail_address }} - -# Hostname of analytics node. If this is not configured value from `hostname` -# will be taken -# hostname = - -# Http server port for inspecting collector state (useful for debugging) -http_server_port = 8089 - -# Category for logging. Default value is '*' -# log_category = - -# Local log file name -log_file = /var/log/contrail/contrail-collector.log - -# Maximum log file rollover index -# log_files_count = 10 - -# Maximum log file size -# log_file_size = 1048576 # 1MB - -# Log severity levels. Possible values are SYS_EMERG, SYS_ALERT, SYS_CRIT, -# SYS_ERR, SYS_WARN, SYS_NOTICE, SYS_INFO and SYS_DEBUG. Default is SYS_DEBUG -log_level = SYS_NOTICE - -# Enable/Disable local file logging. Possible values are 0 (disable) and -# 1 (enable) -log_local = 1 - -# TCP and UDP ports to listen on for receiving syslog messages. -1 to disable. -syslog_port = -1 - -# UDP port to listen on for receiving sFlow messages. -1 to disable. -# sflow_port = 6343 - -# UDP port to listen on for receiving ipfix messages. -1 to disable. -# ipfix_port = 4739 - -[COLLECTOR] -# Everything in this section is optional - -# Port to listen on for receiving Sandesh messages -port = 8086 - -# IP address to bind to for listening -# server = 0.0.0.0 - -# UDP port to listen on for receiving Google Protocol Buffer messages -# protobuf_port = 3333 - -[DISCOVERY] -# Port to connect to for communicating with discovery server -# port = 5998 - -# IP address of discovery server -server = {{ contrail_haproxy_address }} - -[REDIS] -# Port to connect to for communicating with redis-server -port = 6379 - -# IP address of redis-server -server = 127.0.0.1 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-control-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-control-conf.j2 deleted file mode 100755 index 83792b2c..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-control-conf.j2 +++ /dev/null @@ -1,15 +0,0 @@ -[DEFAULT] -hostip = {{ contrail_address }} -hostname = {{ ansible_hostname }} -log_file = /var/log/contrail/contrail-control.log -log_level = SYS_NOTICE -log_local = 1 - -[DISCOVERY] -server = {{ contrail_haproxy_address }} -port = 5998 - -[IFMAP] -certs_store = -user = {{ contrail_address }} -password = {{ contrail_address }} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2 deleted file mode 100755 index a13a00b4..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-device-manager-conf.j2 +++ /dev/null @@ -1,16 +0,0 @@ -[DEFAULTS] -api_server_ip = {{ contrail_haproxy_address }} -api_server_port = 8082 -zk_server_ip = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:2181{% if not loop.last %}, {% endif %}{% endfor %} - -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - -disc_server_ip = {{ contrail_haproxy_address }} -disc_server_port = 5998 -rabbit_server = {{ contrail_haproxy_address }} -rabbit_port = 5672 -rabbit_user = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} -log_file = /var/log/contrail/contrail-device-manager.log -log_level = SYS_NOTICE -log_local = 1 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 deleted file mode 100755 index f54fdc94..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-conf.j2 +++ /dev/null @@ -1,43 +0,0 @@ -[DEFAULTS] -listen_ip_addr = {{ contrail_haproxy_address }} -listen_port = 5998 -zk_server_ip = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}{% if not loop.last %}, {% endif %}{% endfor %} - -zk_server_port = 2181 -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - -log_file = /var/log/contrail/contrail-discovery.log -log_level = SYS_NOTICE -log_local = 1 - -# minimim time to allow client to cache service information (seconds) -ttl_min = 300 - -# maximum time to allow client to cache service information (seconds) -ttl_max = 1800 - -# health check ping interval < = 0 for disabling -hc_interval = 5 - -# maximum hearbeats to miss before server will declare publisher out of -# service. -hc_max_miss = 3 - -# use short TTL for agressive rescheduling if all services are not up -ttl_short = 1 - -# for DNS service, we use fixed policy -# even when the cluster has more than two control nodes, only two of these -# should provide the DNS service -[DNS-SERVER] -policy = fixed - -###################################################################### -# Other service specific knobs ... - -# use short TTL for agressive rescheduling if all services are not up -# ttl_short = 1 - -# specify policy to use when assigning services -# policy = [load-balance | round-robin | fixed] -###################################################################### diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-supervisord-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-supervisord-conf.j2 deleted file mode 100755 index 541568de..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-discovery-supervisord-conf.j2 +++ /dev/null @@ -1,12 +0,0 @@ -[program:contrail-discovery] -command=/usr/bin/contrail-discovery --conf_file /etc/contrail/contrail-discovery.conf --worker_id %(process_num)s -numprocs=1 -process_name=%(process_num)s -redirect_stderr=true -stdout_logfile=/var/log/contrail/contrail-discovery-%(process_num)s-stdout.log -stderr_logfile=/dev/null -priority=430 -autostart=true -killasgroup=true -stopsignal=KILL -exitcodes=0 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-dns-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-dns-conf.j2 deleted file mode 100755 index 9d415563..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-dns-conf.j2 +++ /dev/null @@ -1,15 +0,0 @@ -[DEFAULT] -hostip = {{ contrail_address }} -hostname = {{ inventory_hostname }} -log_file = /var/log/contrail/contrail-dns.log -log_level = SYS_NOTICE -log_local = 1 - -[DISCOVERY] -server = {{ contrail_haproxy_address }} -port = 5998 - -[IFMAP] -certs_store = -user = {{ contrail_address }}.dns -password = {{ contrail_address }}.dns diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-keystone-auth-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-keystone-auth-conf.j2 deleted file mode 100755 index f362ef45..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-keystone-auth-conf.j2 +++ /dev/null @@ -1,9 +0,0 @@ -[KEYSTONE] -auth_protocol = http -auth_host = {{ contrail_keystone_address }} -auth_port = 35357 -admin_tenant_name = admin -admin_user = {{ contrail_admin_user }} -admin_password = {{ contrail_admin_password }} -insecure = False - diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-query-engine-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-query-engine-conf.j2 deleted file mode 100755 index d947addb..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-query-engine-conf.j2 +++ /dev/null @@ -1,18 +0,0 @@ -[DEFAULT] -hostip = {{ contrail_address }} - - -#cassandra_server_list = {% for cur_host in groups['controller'] %}{{ ip_settings[cur_host]['mgmt']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - - -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - -collectors = {{ contrail_haproxy_address }}:8086 -http_server_port = 8091 -log_file = /var/log/contrail/contrail-query-engine.log -log_level = SYS_NOTICE -log_local = 1 - -[REDIS] -server = 127.0.0.1 -port = 6379 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-schema-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-schema-conf.j2 deleted file mode 100755 index d112dbee..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-schema-conf.j2 +++ /dev/null @@ -1,22 +0,0 @@ -[DEFAULTS] -ifmap_server_ip = {{ contrail_haproxy_address }} -ifmap_server_port = 8443 -ifmap_username = schema-transformer -ifmap_password = schema-transformer -api_server_ip = {{ contrail_haproxy_address }} -api_server_port = 8082 -zk_server_ip = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:2181{% if not loop.last %}, {% endif %}{% endfor %} - -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - -disc_server_ip = {{ contrail_haproxy_address }} -disc_server_port = 5998 -log_file = /var/log/contrail/contrail-schema.log -log_level = SYS_NOTICE -log_local = 1 - -[SECURITY] -use_certs = False -keyfile = /etc/contrail/ssl/private_keys/apiserver_key.pem -certfile = /etc/contrail/ssl/certs/apiserver.pem -ca_certs = /etc/contrail/ssl/certs/ca.pem diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-sudoers.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-sudoers.j2 deleted file mode 100755 index 1ff43563..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-sudoers.j2 +++ /dev/null @@ -1,5 +0,0 @@ -Defaults:contrail !requiretty - -Cmnd_Alias CONFIGRESTART = /usr/sbin/service supervisor-config restart - -contrail ALL = (root) NOPASSWD:CONFIGRESTART diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2 deleted file mode 100755 index 0c6bfc07..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-svc-monitor-conf.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[DEFAULTS] -ifmap_server_ip = {{ contrail_haproxy_address }} -ifmap_server_port = 8443 -ifmap_username = svc-monitor -ifmap_password = svc-monitor -api_server_ip = {{ contrail_haproxy_address }} -api_server_port = 8082 -zk_server_ip = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:2181{% if not loop.last %}, {% endif %}{% endfor %} - -cassandra_server_list = {% for cur_host in groups['opencontrail'] %}{{ ip_settings[cur_host]['br-prv']['ip'] }}:9160{% if not loop.last %} {% endif %}{% endfor %} - -disc_server_ip = {{ contrail_haproxy_address }} -disc_server_port = 5998 -rabbit_server = {{ contrail_haproxy_address }} -rabbit_port = 5672 -rabbit_user = {{ RABBIT_USER }} -rabbit_password = {{ RABBIT_PASS }} -region_name = RegionOne -log_file = /var/log/contrail/contrail-svc-monitor.log -log_level = SYS_NOTICE -log_local = 1 - -[SECURITY] -use_certs = False -keyfile = /etc/contrail/ssl/private_keys/apiserver_key.pem -certfile = /etc/contrail/ssl/certs/apiserver.pem -ca_certs = /etc/contrail/ssl/certs/ca.pem - -[SCHEDULER] -analytics_server_ip = {{ contrail_haproxy_address }} -analytics_server_port = 8081 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-tor-agent-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-tor-agent-conf.j2 deleted file mode 100755 index 8d336e52..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-tor-agent-conf.j2 +++ /dev/null @@ -1,111 +0,0 @@ -# -# Vnswad configuration options -# - -[CONTROL-NODE] -# IP address to be used to connect to control-node. Maximum of 2 IP addresses -# (separated by a space) can be provided. If no IP is configured then the -# value provided by discovery service will be used. (optional) -# server = 10.0.0.1 10.0.0.2 - -[DEFAULT] -agent_name = {{ ansible_hostname }}-{{ item.ansible_facts.toragent_index }} -# Everything in this section is optional - -# IP address and port to be used to connect to collector. If these are not -# configured, value provided by discovery service will be used. Multiple -# IP:port strings separated by space can be provided -# collectors = 127.0.0.1:8086 - -# Enable/disable debug logging. Possible values are 0 (disable) and 1 (enable) -# debug = 0 - -# Aging time for flow-records in seconds -# flow_cache_timeout = 0 - -# Hostname of compute-node. If this is not configured value from `hostname` -# will be taken -# hostname = - -# Category for logging. Default value is '*' -# log_category = - -# Local log file name -log_file = /var/log/contrail/contrail-tor-agent-{{ item.ansible_facts.toragent_index }}.log - -# Log severity levels. Possible values are SYS_EMERG, SYS_ALERT, SYS_CRIT, -# SYS_ERR, SYS_WARN, SYS_NOTICE, SYS_INFO and SYS_DEBUG. Default is SYS_DEBUG -# log_level = SYS_DEBUG - -# Enable/Disable local file logging. Possible values are 0 (disable) and 1 (enable) -# log_local = 0 - -# Enable/Disable local flow message logging. Possible values are 0 (disable) and 1 (enable) -# log_flow = 0 - -# Encapsulation type for tunnel. Possible values are MPLSoGRE, MPLSoUDP, VXLAN -# tunnel_type = - -# Enable/Disable headless mode for agent. In headless mode agent retains last -# known good configuration from control node when all control nodes are lost. -# Possible values are true(enable) and false(disable) -# headless_mode = - -# Define agent mode. Only supported value is "tor" -agent_mode = tor - -# Http server port for inspecting vnswad state (useful for debugging) -# http_server_port = 8085 -http_server_port = {{ item.ansible_facts.toragent_params.http_server_port }} - -[DISCOVERY] -#If DEFAULT.collectors and/or CONTROL-NODE and/or DNS is not specified this -#section is mandatory. Else this section is optional - -# IP address of discovery server -server = {{ contrail_haproxy_address }} - -# Number of control-nodes info to be provided by Discovery service. Possible -# values are 1 and 2 -# max_control_nodes = 1 - -[DNS] -# IP address to be used to connect to dns-node. Maximum of 2 IP addresses -# (separated by a space) can be provided. If no IP is configured then the -# value provided by discovery service will be used. (Optional) -# server = 10.0.0.1 10.0.0.2 - -[NETWORKS] -# control-channel IP address used by WEB-UI to connect to vnswad to fetch -# required information (Optional) -control_network_ip = {{ contrail_haproxy_address }} - -[TOR] -# IP address of the TOR to manage -tor_ip = {{ item.ansible_facts.toragent_params.address }} - -# Identifier for ToR. Agent will subscribe to ifmap-configuration by this name -tor_id = {{ item.ansible_facts.toragent_index }} - -# ToR management scheme is based on this type. Only supported value is "ovs" -tor_type = ovs - -# OVS server port number on the ToR -tor_ovs_port = {{ item.ansible_facts.toragent_params.ovs_port }} - -# IP-Transport protocol used to connect to tor. Supported values are "tcp", "pssl" -tor_ovs_protocol = {{ item.ansible_facts.toragent_params.ovs_protocol }} - -# Path to ssl certificate for tor-agent, needed for pssl -ssl_cert = /etc/contrail/ssl/certs/tor.{{ item.ansible_facts.toragent_index }}.cert.pem - -# Path to ssl private-key for tor-agent, needed for pssl -ssl_privkey = /etc/contrail/ssl/private/tor.{{ item.ansible_facts.toragent_index }}.privkey.pem - -# Path to ssl cacert for tor-agent, needed for pssl -ssl_cacert = /etc/contrail/ssl/certs/cacert.pem - -tsn_ip = {{ contrail_address }} - -# OVS keep alive timer interval in milliseconds -tor_keepalive_interval = 10000 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-tor-agent-ini.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-tor-agent-ini.j2 deleted file mode 100755 index db6944c9..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-tor-agent-ini.j2 +++ /dev/null @@ -1,12 +0,0 @@ -[program:contrail-tor-agent-{{ item.ansible_facts.toragent_index }}] -command=/usr/bin/contrail-tor-agent --config_file /etc/contrail/contrail-tor-agent-{{ item.ansible_facts.toragent_index }}.conf -priority=420 -autostart=true -killasgroup=true -stopsignal=KILL -stdout_capture_maxbytes=1MB -redirect_stderr=true -stdout_logfile=/var/log/contrail/contrail-tor-agent-{{ item.ansible_facts.toragent_index }}-stdout.log -stderr_logfile=/dev/null -startsecs=5 -exitcodes=0 ; 'expected' exit codes for process (default 0,2) diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vnc-api-lib-ini.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vnc-api-lib-ini.j2 deleted file mode 100755 index 85a7b63a..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vnc-api-lib-ini.j2 +++ /dev/null @@ -1,11 +0,0 @@ -[global] -WEB_SERVER=127.0.0.1 -WEB_PORT=8082 ; connection to api-server directly -BASE_URL=/ - -[auth] -AUTHN_TYPE=keystone -AUTHN_PROTOCOL=http -AUTHN_SERVER={{ contrail_keystone_address }} -AUTHN_PORT=35357 -AUTHN_URL=/v2.0/tokens diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 deleted file mode 100755 index d64cc21c..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/contrail-vrouter-agent-conf.j2 +++ /dev/null @@ -1,177 +0,0 @@ -# -# Vnswad configuration options -# - -[CONTROL-NODE] -# IP address to be used to connect to control-node. Maximum of 2 IP addresses -# (separated by a space) can be provided. If no IP is configured then the -# value provided by discovery service will be used. (Optional) -# server = 10.0.0.1 10.0.0.2 - -[DEFAULT] -# Everything in this section is optional - -# IP address and port to be used to connect to collector. If these are not -# configured, value provided by discovery service will be used. Multiple -# IP:port strings separated by space can be provided -# collectors = 127.0.0.1:8086 - -# Agent mode : can be vrouter / tsn / tor (default is vrouter) -{% if contrail_vrouter_mode is defined %}agent_mode = {{ contrail_vrouter_mode }} -{% else %}# agent_mode = -{% endif %} - -# Enable/disable debug logging. Possible values are 0 (disable) and 1 (enable) -# debug = 0 - -# Aging time for flow-records in seconds -# flow_cache_timeout = 0 - -# Hostname of compute-node. If this is not configured value from `hostname` -# will be taken -# hostname = - -# Http server port for inspecting vnswad state (useful for debugging) -# http_server_port = 8085 - -# Category for logging. Default value is '*' -# log_category = - -# Local log file name -log_file = /var/log/contrail/contrail-vrouter-agent.log - -# Log severity levels. Possible values are SYS_EMERG, SYS_ALERT, SYS_CRIT, -# SYS_ERR, SYS_WARN, SYS_NOTICE, SYS_INFO and SYS_DEBUG. Default is SYS_DEBUG -log_level = SYS_NOTICE - -# Enable/Disable local file logging. Possible values are 0 (disable) and 1 (enable) -log_local = 1 - -# Encapsulation type for tunnel. Possible values are MPLSoGRE, MPLSoUDP, VXLAN -# tunnel_type = - -# Enable/Disable headless mode for agent. In headless mode agent retains last -# known good configuration from control node when all control nodes are lost. -# Possible values are true(enable) and false(disable) -# headless_mode = - -# DHCP relay mode (true or false) to determine if a DHCP request in fabric -# interface with an unconfigured IP should be relayed or not -# dhcp_relay_mode = - -# DPDK or legacy work mode -platform = default - -# Physical address of PCI used by dpdk -physical_interface_address = - -# MAC address of device used by dpdk -physical_interface_mac = {{ hostvars[inventory_hostname]['ansible_'+contrail_vhost_device]['macaddress'] }} - -[DISCOVERY] -# If COLLECTOR and/or CONTROL-NODE and/or DNS is not specified this section is -# mandatory. Else this section is optional - -# IP address of discovery server -server = {{ contrail_haproxy_address }} - -# Number of control-nodes info to be provided by Discovery service. Possible -# values are 1 and 2 -max_control_nodes = {{ groups['opencontrail'] | length }} - -[DNS] -# IP address and port to be used to connect to dns-node. Maximum of 2 IP -# addresses (separated by a space) can be provided. If no IP is configured then -# the value provided by discovery service will be used. -# server = 10.0.0.1:53 10.0.0.2:53 - -[HYPERVISOR] -# Everything in this section is optional - -# Hypervisor type. Possible values are kvm, xen and vmware -type = kvm -vmware_mode = - -# Link-local IP address and prefix in ip/prefix_len format (for xen) -# xen_ll_ip = - -# Link-local interface name when hypervisor type is Xen -# xen_ll_interface = - -# Physical interface name when hypervisor type is vmware -vmware_physical_interface = - -[FLOWS] -# Everything in this section is optional - -# Maximum flows allowed per VM (given as % of maximum system flows) -# max_vm_flows = 100 -# Maximum number of link-local flows allowed across all VMs -# max_system_linklocal_flows = 4096 -# Maximum number of link-local flows allowed per VM -# max_vm_linklocal_flows = 1024 - -[METADATA] -# Shared secret for metadata proxy service (Optional) -# metadata_proxy_secret = contrail - -[NETWORKS] -# control-channel IP address used by WEB-UI to connect to vnswad to fetch -# required information (Optional) -control_network_ip = {{ contrail_haproxy_address }} - -[VIRTUAL-HOST-INTERFACE] -# Everything in this section is mandatory - -# name of virtual host interface -name = vhost0 - -# IP address and prefix in ip/prefix_len format -ip = {{ contrail_vhost_address }}/{{ contrail_prefixlen }} - -# Gateway IP address for virtual host -gateway = {{ contrail_vhost_gateway }} - -# Physical interface name to which virtual host interface maps to -physical_interface = {{ contrail_vhost_device }} - -# We can have multiple gateway sections with different indices in the -# following format -# [GATEWAY-0] -# Name of the routing_instance for which the gateway is being configured -# routing_instance = default-domain:admin:public:public - -# Gateway interface name -# interface = vgw - -# Virtual network ip blocks for which gateway service is required. Each IP -# block is represented as ip/prefix. Multiple IP blocks are represented by -# separating each with a space -# ip_blocks = 1.1.1.1/24 - -# [GATEWAY-1] -# Name of the routing_instance for which the gateway is being configured -# routing_instance = default-domain:admin:public1:public1 - -# Gateway interface name -# interface = vgw1 - -# Virtual network ip blocks for which gateway service is required. Each IP -# block is represented as ip/prefix. Multiple IP blocks are represented by -# separating each with a space -# ip_blocks = 2.2.1.0/24 2.2.2.0/24 - -# Routes to be exported in routing_instance. Each route is represented as -# ip/prefix. Multiple routes are represented by separating each with a space -# routes = 10.10.10.1/24 11.11.11.1/24 - -[SERVICE-INSTANCE] -# Path to the script which handles the netns commands -netns_command = /usr/bin/opencontrail-vrouter-netns - -# Number of workers that will be used to start netns commands -#netns_workers = 1 - -# Timeout for each netns command, when the timeout is reached, the netns -# command is killed. -#netns_timeout = 30 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/default-pmac.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/default-pmac.j2 deleted file mode 100755 index dac56d1d..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/default-pmac.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ hostvars[inventory_hostname][contrail_ansible_device]['macaddress'] }} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2 deleted file mode 100755 index 01196369..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/haproxy-contrail-cfg.j2 +++ /dev/null @@ -1,78 +0,0 @@ -#contrail-marker-start - -listen contrail-stats -# bind *:5937 - bind {{ internal_vip.ip }}:5937 - bind {{ public_vip.ip }}:5937 - mode http - stats enable - stats uri / - stats auth haproxy:contrail123 - -# compass has bind neutron-server -#listen neutron-server -# bind *:9696 -# balance roundrobin -# option nolinger -#{% for host,ip in haproxy_hosts.items() %} -# server {{ host }} {{ ip }}:9697 weight 1 check inter 2000 rise 2 fall 3 -#{% endfor %} - - - -listen contrail-api -# bind *:8082 - bind {{ internal_vip.ip }}:8082 - bind {{ public_vip.ip }}:8082 - balance roundrobin - option nolinger - timeout client 3m - timeout server 3m -{% for host,ip in haproxy_hosts.items() %} - server {{ host }} {{ ip }}:8082 weight 1 check inter 2000 rise 2 fall 3 -{% endfor %} - - - -listen contrail-discovery -# bind *:5998 - bind {{ internal_vip.ip }}:5998 - bind {{ public_vip.ip }}:5998 - balance roundrobin - option nolinger -{% for host,ip in haproxy_hosts.items() %} - server {{ host }} {{ ip }}:5998 weight 1 check inter 2000 rise 2 fall 3 -{% endfor %} - - - -listen contrail-analytics-api -# bind *:8081 - bind {{ internal_vip.ip }}:8081 - bind {{ public_vip.ip }}:8081 - balance roundrobin - option nolinger - option tcp-check - tcp-check connect port 6379 - default-server error-limit 1 on-error mark-down -{% for host,ip in haproxy_hosts.items() %} - server {{ host }} {{ ip }}:8081 weight 1 check inter 2000 rise 2 fall 5 -{% endfor %} - - -# compass doesn't use ha for rabbitmq, but use cluster mode -#listen rabbitmq -# bind *:5673 -# mode tcp -# balance roundrobin -# maxconn 10000 -# option tcplog -# option tcpka -# option redispatch -# timeout client 48h -# timeout server 48h -{% for host,ip in haproxy_hosts.items() %} -# server {{ host }} {{ ip }}:5672 weight 1 check inter 2000 rise 2 fall 5 -{% endfor %} - -#contrail-marker-end diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-authorization-properties.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-authorization-properties.j2 deleted file mode 100755 index 41a1c649..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-authorization-properties.j2 +++ /dev/null @@ -1,2 +0,0 @@ -# The MAPC with basic auth username 'reader' has read only access. -reader=ro diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-basicauthusers-properties.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-basicauthusers-properties.j2 deleted file mode 100755 index 6ca38a29..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-basicauthusers-properties.j2 +++ /dev/null @@ -1,30 +0,0 @@ -test:test -test2:test2 -test3:test3 -dhcp:dhcp -visual:visual -sensor:sensor - -# compliance testsuite users -mapclient:mapclient -helper:mapclient - -# This is a read-only MAPC -reader:reader - -# OpenContrail users -api-server:api-server -schema-transformer:schema-transformer -svc-monitor:svc-monitor - -control-user:control-user-passwd -control-node-1:control-node-1 -control-node-2:control-node-2 -control-node-3:control-node-3 -control-node-4:control-node-4 -control-node-5:control-node-5 -control-node-6:control-node-6 -control-node-7:control-node-7 -control-node-8:control-node-8 -control-node-9:control-node-9 -control-node-10:control-node-10 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-log4j-properties.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-log4j-properties.j2 deleted file mode 100755 index ebd0b483..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-log4j-properties.j2 +++ /dev/null @@ -1,26 +0,0 @@ -# Set root logger level to DEBUG and its only appender to CONSOLE -log4j.rootLogger=TRACE, CONSOLE -log4j.error - -log4j.logger.de.fhhannover.inform.irond.proc=TRACE, A1, A2 -log4j.additivity.de.fhhannover.inform.irond.proc=false - -log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %x - %m%n - -log4j.appender.A2=org.apache.log4j.FileAppender -log4j.appender.A2.File=/var/log/contrail/ifmap-server.log -log4j.appender.A2.layout=org.apache.log4j.PatternLayout -log4j.appender.A2.layout.ConversionPattern=%d [%t] %-5p %x - %m%n - -log4j.logger.de.fhhannover.inform.irond.rawrequests=TRACE, A3 -log4j.additivity.de.fhhannover.inform.irond.rawrequests=false -log4j.appender.A3=org.apache.log4j.FileAppender -log4j.appender.A3.file=irond_raw.log -log4j.appender.A3.layout=org.apache.log4j.PatternLayout -log4j.appender.A3.layout.ConversionPattern=%d %-5p %x - %m%n - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%-8r [%t] %-5p %C{1} %x - %m%n diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-publisher-properties.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-publisher-properties.j2 deleted file mode 100755 index 90d2a887..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/ifmap-publisher-properties.j2 +++ /dev/null @@ -1,16 +0,0 @@ -#Sun May 27 15:47:44 PDT 2012 -visual=visual--1877135140-1 -test=test--1870931913-1 -test2=test2--1870931914-1 -test3=test3--1870931915-1 -api-server=api-server-1--0000000001-1 -control-node-1=control-node-1--1870931921-1 -control-node-2=control-node-1--1870931922-1 -control-node-3=control-node-1--1870931923-1 -control-node-4=control-node-1--1870931924-1 -control-node-5=control-node-1--1870931925-1 -control-node-6=control-node-1--1870931926-1 -control-node-7=control-node-1--1870931927-1 -control-node-8=control-node-1--1870931928-1 -control-node-9=control-node-1--1870931929-1 -control-node-10=control-node-10--1870931930-1 diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/keepalived-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/keepalived-conf.j2 deleted file mode 100755 index b16c4a25..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/keepalived-conf.j2 +++ /dev/null @@ -1,29 +0,0 @@ -vrrp_script chk_haproxy { - script "killall -0 haproxy" - interval 1 - timeout 3 - rise 2 - fall 2 -} - -vrrp_instance INTERNAL_1 { - interface {{ contrail_device }} - state MASTER - preemt_delay 7 - grap_master_delay 5 - grap_master_repeat 3 - grap_master_refresh 1 - advert_int 1 - virtual_router_id 85 - vmac_xmit_base - priority 10{{ item.0 }} - virtual_ipaddress { - {{ contrail_haproxy_address }} dev {{ contrail_device }} - } - track_script { - chk_haproxy - } - track_interface { - {{ contrail_device }} - } -} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/neutron-contrail-plugin-ini.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/neutron-contrail-plugin-ini.j2 deleted file mode 100755 index 13e5965a..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/neutron-contrail-plugin-ini.j2 +++ /dev/null @@ -1,15 +0,0 @@ -[APISERVER] -api_server_ip={{ contrail_haproxy_address }} -api_server_port=8082 -multi_tenancy=True -contrail_extensions=ipam:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_ipam.NeutronPluginContrailIpam,policy:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_policy.NeutronPluginContrailPolicy,route-table:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_vpc.NeutronPluginContrailVpc,contrail:None - -[COLLECTOR] -analytics_api_ip={{ contrail_haproxy_address }} -analytics_api_port=8081 - -[KEYSTONE] -auth_url=http://{{ contrail_keystone_address }}:35357/v2.0 -admin_tenant_name=admin -admin_user={{ contrail_admin_user }} -admin_password={{ contrail_admin_password }} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/nova.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/nova.j2 deleted file mode 100755 index ea4dbbad..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/nova.j2 +++ /dev/null @@ -1,58 +0,0 @@ -[DEFAULT] -dhcpbridge_flagfile=/etc/nova/nova.conf -dhcpbridge=/usr/bin/nova-dhcpbridge -logdir=/var/log/nova -state_path=/var/lib/nova -lock_path=/var/lib/nova/tmp -force_dhcp_release=True -libvirt_use_virtio_for_bridges=True -verbose=True -ec2_private_dns_show_ip=False -auth_strategy = keystone -libvirt_nonblocking = True -libvirt_inject_partition = -1 -compute_driver = libvirt.LibvirtDriver -novncproxy_base_url = http://{{ contrail_keystone_address }}:6080/vnc_auto.html -vncserver_enabled = true -vncserver_listen = {{ contrail_address }} -vncserver_proxyclient_address = {{ contrail_address }} -security_group_api = neutron -heal_instance_info_cache_interval = 0 -image_cache_manager_interval = 0 -libvirt_cpu_mode = none -libvirt_vif_driver = nova_contrail_vif.contrailvif.VRouterVIFDriver -firewall_driver = nova.virt.firewall.NoopFirewallDriver -glance_host = {{ contrail_keystone_address }} -glance_port = 9292 -glance_num_retries = 10 -rabbit_host = {{ contrail_keystone_address }} -rabbit_port = 5672 -rabbit_password = {{ rabbit_password }} -rabbit_retry_interval = 1 -rabbit_retry_backoff = 2 -rabbit_max_retries = 0 -rabbit_ha_queues = True -rpc_cast_timeout = 30 -rpc_conn_pool_size = 40 -rpc_response_timeout = 60 -rpc_thread_pool_size = 70 -report_interval = 15 -novncproxy_port = 6080 -vnc_port = 5900 -vnc_port_total = 100 -resume_guests_state_on_host_boot = True -service_down_time = 300 -periodic_fuzzy_delay = 30 -disable_process_locking = True -neutron_admin_auth_url = - -[keystone_authtoken] -admin_tenant_name = service -admin_user = nova -admin_password = {{ contrail_admin_password }} -auth_host = {{ contrail_keystone_address }} -auth_protocol = http -auth_port = 5000 -signing_dir = /tmp/keystone-signing-nova - - diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/qemu-device-acl-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/qemu-device-acl-conf.j2 deleted file mode 100755 index 53dfbba2..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/qemu-device-acl-conf.j2 +++ /dev/null @@ -1,6 +0,0 @@ -cgroup_device_acl = [ - "/dev/null", "/dev/full", "/dev/zero", - "/dev/random", "/dev/urandom", - "/dev/ptmx", "/dev/kvm", "/dev/kqemu", - "/dev/rtc", "/dev/hpet","/dev/net/tun" -] diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-conf-single.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-conf-single.j2 deleted file mode 100644 index cce01c77..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-conf-single.j2 +++ /dev/null @@ -1,6 +0,0 @@ -[ - {rabbit, [ {tcp_listeners, [{"{{ internal_ip }}", 5672}]}, - {loopback_users, []}, - {log_levels,[{connection, info},{mirroring, info}]} ] - } -]. diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-conf.j2 deleted file mode 100644 index f0d09c4f..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-conf.j2 +++ /dev/null @@ -1,25 +0,0 @@ -[ - {rabbit, [ {tcp_listeners, [{"{{ contrail_address }}", 5672}]}, {cluster_partition_handling, autoheal},{loopback_users, []}, - {cluster_nodes, {[{% for cur_host in groups['opencontrail'] %}'rabbit@{{ cur_host }}'{% if not loop.last %}, {% endif %}{% endfor %}], disc}}, - {vm_memory_high_watermark, 0.4}, - {disk_free_limit,50000000}, - {log_levels,[{connection, info},{mirroring, info}]}, - {heartbeat,10}, - {delegate_count,20}, - {channel_max,5000}, - {tcp_listen_options, - [binary, - {packet, raw}, - {reuseaddr, true}, - {backlog, 128}, - {nodelay, true}, - {exit_on_close, false}, - {keepalive, true} - ] - }, - {collect_statistics_interval, 60000} - ] - }, - {rabbitmq_management_agent, [ {force_fine_statistics, true} ] }, - {kernel, [{net_ticktime, 30}]} -]. diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-cookie.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-cookie.j2 deleted file mode 100644 index 838d0332..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-cookie.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ ansible_date_time.iso8601_micro | to_uuid }} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-env-conf.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-env-conf.j2 deleted file mode 100644 index 6a3b4760..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/rabbitmq-env-conf.j2 +++ /dev/null @@ -1,2 +0,0 @@ -NODE_IP_ADDRESS={{ internal_ip }} -NODENAME=rabbit@{{ ansible_hostname }}-ctrl diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/vrouter-nodemgr-param.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/vrouter-nodemgr-param.j2 deleted file mode 100755 index ee5dcbd7..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/vrouter-nodemgr-param.j2 +++ /dev/null @@ -1 +0,0 @@ -DISCOVERY={{ ip_settings['host1']['br-prv']['ip'] }} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/provision/zookeeper-unique-id.j2 b/deploy/adapters/ansible/roles/open-contrail/templates/provision/zookeeper-unique-id.j2 deleted file mode 100755 index ec0033b3..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/provision/zookeeper-unique-id.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ item.0 + 1 }} diff --git a/deploy/adapters/ansible/roles/open-contrail/templates/vrouter-functions.sh b/deploy/adapters/ansible/roles/open-contrail/templates/vrouter-functions.sh deleted file mode 100755 index 69af7b2a..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/templates/vrouter-functions.sh +++ /dev/null @@ -1,223 +0,0 @@ -#!/bin/bash -############################################################################## -# 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 -############################################################################## - -source /etc/contrail/agent_param - -function pkt_setup () { - for f in /sys/class/net/$1/queues/rx-* - do - q="$(echo $f | cut -d '-' -f2)" - r=$(($q%32)) - s=$(($q/32)) - ((mask=1<<$r)) - str=(`printf "%x" $mask`) - if [ $s -gt 0 ]; then - for ((i=0; i < $s; i++)) - do - str+=,00000000 - done - fi - echo $str > $f/rps_cpus - done -} - -function insert_vrouter() { - if cat $CONFIG | grep '^\s*platform\s*=\s*dpdk\b' &>/dev/null; then - vrouter_dpdk_start - return $? - fi - - grep $kmod /proc/modules 1>/dev/null 2>&1 - if [ $? != 0 ]; then - insmod /var/lib/dkms/vrouter/2.21/build/vrouter.ko - if [ $? != 0 ] - then - echo "$(date) : Error inserting vrouter module" - return 1 - fi - - if [ -f /sys/class/net/pkt1/queues/rx-0/rps_cpus ]; then - pkt_setup pkt1 - fi - if [ -f /sys/class/net/pkt2/queues/rx-0/rps_cpus ]; then - pkt_setup pkt2 - fi - if [ -f /sys/class/net/pkt3/queues/rx-0/rps_cpus ]; then - pkt_setup pkt3 - fi - fi - - # check if vhost0 is not present, then create vhost0 and $dev - if [ ! -L /sys/class/net/vhost0 ]; then - echo "$(date): Creating vhost interface: $DEVICE." - # for bonding interfaces - loops=0 - while [ ! -f /sys/class/net/$dev/address ] - do - sleep 1 - loops=$(($loops + 1)) - if [ $loops -ge 60 ]; then - echo "Unable to look at /sys/class/net/$dev/address" - return 1 - fi - done - - DEV_MAC=$(cat /sys/class/net/$dev/address) - vif --create $DEVICE --mac $DEV_MAC - if [ $? != 0 ]; then - echo "$(date): Error creating interface: $DEVICE" - fi - - - echo "$(date): Adding $dev to vrouter" - DEV_MAC=$(cat /sys/class/net/$dev/address) - vif --add $dev --mac $DEV_MAC --vrf 0 --vhost-phys --type physical - if [ $? != 0 ]; then - echo "$(date): Error adding $dev to vrouter" - fi - - vif --add $DEVICE --mac $DEV_MAC --vrf 0 --type vhost --xconnect $dev - if [ $? != 0 ]; then - echo "$(date): Error adding $DEVICE to vrouter" - fi - fi - return 0 -} - -function vrouter_dpdk_start() { - # wait for vRouter/DPDK to start - echo "$(date): Waiting for vRouter/DPDK to start..." - service ${VROUTER_SERVICE} start - loops=0 - while ! is_vrouter_dpdk_running - do - sleep 1 - loops=$(($loops + 1)) - if [ $loops -ge 60 ]; then - echo "No vRouter/DPDK running." - echo "Please check if ${VROUTER_SERVICE} service is up and running." - return 1 - fi - done - - # TODO: at the moment we have no interface deletion, so this loop might - # be unnecessary in the future - echo "$(date): Waiting for Agent to configure $DEVICE..." - loops=0 - while [ ! -L /sys/class/net/vhost0 ] - do - sleep 1 - loops=$(($loops + 1)) - if [ $loops -ge 10 ]; then - break - fi - done - - # check if vhost0 is not present, then create vhost0 and $dev - if [ ! -L /sys/class/net/vhost0 ]; then - echo "$(date): Creating vhost interface: $DEVICE." - agent_conf_read - - DEV_MAC=${physical_interface_mac} - DEV_PCI=${physical_interface_address} - - if [ -z "${DEV_MAC}" -o -z "${DEV_PCI}" ]; then - echo "No device configuration found in ${CONFIG}" - return 1 - fi - - # TODO: the vhost creation is happening later in vif --add -# vif --create $DEVICE --mac $DEV_MAC -# if [ $? != 0 ]; then -# echo "$(date): Error creating interface: $DEVICE" -# fi - - echo "$(date): Adding $dev to vrouter" - # add DPDK ethdev 0 as a physical interface - vif --add 0 --mac $DEV_MAC --vrf 0 --vhost-phys --type physical --pmd --id 0 - if [ $? != 0 ]; then - echo "$(date): Error adding $dev to vrouter" - fi - - # TODO: vif --xconnect seems does not work without --id parameter? - vif --add $DEVICE --mac $DEV_MAC --vrf 0 --type vhost --xconnect 0 --pmd --id 1 - if [ $? != 0 ]; then - echo "$(date): Error adding $DEVICE to vrouter" - fi - fi - return 0 -} - -DPDK_BIND=/opt/contrail/bin/dpdk_nic_bind.py -VROUTER_SERVICE="supervisor-vrouter" - -function is_vrouter_dpdk_running() { - # check for NetLink TCP socket - lsof -ni:20914 -sTCP:LISTEN > /dev/null - - return $? -} - -function agent_conf_read() { - eval `cat ${CONFIG} | grep -E '^\s*physical_\w+\s*='` -} - -function vrouter_dpdk_if_bind() { - if [ ! -s /sys/class/net/${dev}/address ]; then - echo "No ${dev} device found." - ${DPDK_BIND} --status - return 1 - fi - - modprobe igb_uio - # multiple kthreads for port monitoring - modprobe rte_kni kthread_mode=multiple - - ${DPDK_BIND} --force --bind=igb_uio $dev - ${DPDK_BIND} --status -} - -function vrouter_dpdk_if_unbind() { - if [ -s /sys/class/net/${dev}/address ]; then - echo "Device ${dev} is already unbinded." - ${DPDK_BIND} --status - return 1 - fi - - agent_conf_read - - DEV_PCI=${physical_interface_address} - DEV_DRIVER=`lspci -vmmks ${DEV_PCI} | grep 'Module:' | cut -d $'\t' -f 2` - - if [ -z "${DEV_DRIVER}" -o -z "${DEV_PCI}" ]; then - echo "No device ${dev} configuration found in ${AGENT_DPDK_PARAMS_FILE}" - return 1 - fi - - # wait for vRouter/DPDK to stop - echo "$(date): Waiting for vRouter/DPDK to stop..." - loops=0 - while is_vrouter_dpdk_running - do - sleep 1 - loops=$(($loops + 1)) - if [ $loops -ge 60 ]; then - echo "vRouter/DPDK is still running." - echo "Please try to stop ${VROUTER_SERVICE} service." - return 1 - fi - done - - ${DPDK_BIND} --force --bind=${DEV_DRIVER} ${DEV_PCI} - ${DPDK_BIND} --status - - rmmod rte_kni - rmmod igb_uio -} diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml b/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml deleted file mode 100755 index 845aa78c..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/vars/Debian.yml +++ /dev/null @@ -1,48 +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 -############################################################################## ---- - -package: "contrail-install-packages_2.21-102-ubuntu-14-04juno_all.deb" - -common_package: - - contrail-setup - -kernel_package: - - linux-headers-3.13.0-40 - - linux-headers-3.13.0-40-generic - - linux-image-3.13.0-40-generic - - linux-image-extra-3.13.0-40-generic - -kernel_required: "3.13.0-40-generic" - -database_package: - - contrail-openstack-database - -config_package: - - contrail-openstack-config - -control_package: - - contrail-openstack-control - -collector_package: - - contrail-openstack-analytics - -webui_package: - - contrail-openstack-webui - -vrouter_package: - - contrail-vrouter-3.13.0-40-generic - -dkms_package: - - contrail-vrouter-dkms - -compute_package: - - contrail-vrouter-common - - contrail-nova-vif - diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/RedHat.yml b/deploy/adapters/ansible/roles/open-contrail/vars/RedHat.yml deleted file mode 100755 index d760b4e6..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/vars/RedHat.yml +++ /dev/null @@ -1,9 +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 -############################################################################## ---- diff --git a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml b/deploy/adapters/ansible/roles/open-contrail/vars/main.yml deleted file mode 100755 index 582e41e8..00000000 --- a/deploy/adapters/ansible/roles/open-contrail/vars/main.yml +++ /dev/null @@ -1,89 +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 -############################################################################## ---- -#package: "contrail-install-packages_2.21-102~juno_all.deb" # mv to {os}.yml -kernel_install: no -#ansible_ssh_user: "root" -#ansible_ssh_pass: "root" - -#contrail_keystone_address: "{{ internal_vip.ip }}" -contrail_keystone_address: "{{ public_vip.ip }}" -contrail_admin_user: "admin" -contrail_admin_password: "console" - -neutron_plugin: neutron_plugin_contrail.tar.gz -nova_plugin: nova_contrail_vif.tar.gz - - -# network infor adapter for compass -# contrail_address: "{{ internal_ip }}" -contrail_address: "{{ ip_settings[inventory_hostname]['br-prv']['ip'] }}" -#contrail_device: # compass openstack device -contrail_netmask: "255.255.255.0" -#contrail_gateway: "10.84.50.254" -contrail_gateway: -#contrail_mgmt_address: "172.27.113.91" - - - -########################################################### -### we make an independent NIC for OpenContrail vRouter ### -########################################################### -contrail_vhost_device: "{{ network_cfg['provider_net_mappings'][0]['interface'] }}" -contrail_vhost_address: "{{ ip_settings[inventory_hostname]['br-prv']['ip'] }}" -contrail_vhost_gateway: "{{ ip_settings[inventory_hostname]['br-prv']['gw'] }}" -contrail_vhost_netmask: "{{ ip_settings[inventory_hostname]['br-prv']['netmask'] }}" -########################################################### -########################################################### -########################################################### - - - - -contrail_keepalived: no -#contrail_haproxy_address: "10.0.0.22" # 10.0.0.80 -#contrail_haproxy_address: "{{ internal_vip.ip }}" -contrail_haproxy_address: "{{ public_vip.ip }}" -contrail_netmask: "255.255.255.0" -contrail_prefixlen: "24" -contrail_gateway: "10.0.0.1" - -contrail_router_asn: "64512" - -### Modify when need openstack provisioning -keystone_provision: no -install_nova: no -#rabbit_password: {{ RABBIT_PASS }} - -contrail_tor_agents: - - name: "test01" - address: "10.0.0.81" - ovs_protocol: "pssl" - ovs_port: "9991" - tunnel_address: "10.0.0.81" - http_server_port: "9011" - vendor_name: "Juniper" - product_name: "QFX5100" - tsn_names: [ "system002" ] - - name: "test02" - address: "10.0.0.82" - ovs_protocol: "pssl" - ovs_port: "9992" - tunnel_address: "10.0.0.82" - http_server_port: "9012" - vendor_name: "Juniper" - product_name: "QFX5100" - tsn_names: [ "system002" ] - - -# adapter for compass -kernel_package_noarch: [] - -compute_package_noarch: [] - -- cgit 1.2.3-korg