From 8726a0d7ed8286d1aa86523a4acf61d9d4b4c9cd Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 20 Nov 2017 15:50:53 +0400 Subject: [virtual] Update openstack version to pike Change-Id: I1df0228cb44bf9122aaf93dd25fc16a0d26a5240 Signed-off-by: Michael Polenchuk --- .../virtual-mcp-ocata-odl-router/infra/config.yml | 22 --------- .../cluster/virtual-mcp-ocata-odl-router/init.yml | 20 -------- .../opendaylight/control.yml | 41 ---------------- .../openstack/compute.yml | 56 ---------------------- .../openstack/control.yml | 42 ---------------- .../openstack/gateway.yml | 41 ---------------- .../openstack/init.yml | 29 ----------- 7 files changed, 251 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml (limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router') diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml deleted file mode 100644 index 24c302869..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml +++ /dev/null @@ -1,22 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB 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 -############################################################################## ---- -classes: - - system.reclass.storage.system.opendaylight_control_single - - cluster.virtual-mcp-ocata-common.infra.config - - cluster.virtual-mcp-ocata-odl-router -parameters: - reclass: - storage: - node: - opendaylight_control_node01: - classes: - - cluster.${_param:cluster_name}.opendaylight.control - params: - linux_system_codename: xenial - single_address: ${_param:opendaylight_service_host} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml deleted file mode 100644 index 980ea1b0b..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB 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 -############################################################################## ---- -classes: - - system.linux.system.single - - cluster.all-mcp-ocata-common - - cluster.virtual-mcp-ocata-common.init_options - - cluster.virtual-mcp-ocata-common.infra - - cluster.virtual-mcp-ocata-odl-router.openstack - -parameters: - _param: - cluster_domain: virtual-mcp-ocata-odl-router.local - cluster_name: virtual-mcp-ocata-odl-router - opendaylight_service_host: 172.16.10.111 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml deleted file mode 100644 index f75cd3300..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB 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 -############################################################################## ---- -classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - - system.opendaylight.server.single - - cluster.virtual-mcp-ocata-odl-router -parameters: - _param: - linux_system_codename: xenial - linux: - network: - interface: - single_int: - enabled: true - name: ${_param:opnfv_fn_vm_secondary_interface} - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - opendaylight: - server: - odl_bind_ip: ${_param:single_address} - odl_rest_port: 8282 - java_min_mem: 3g - java_max_mem: 3g - router_enabled: true - karaf_features: - odl_default: - - odl-restconf-all - - odl-aaa-authn - - odl-dlux-all - - odl-mdsal-apidocs - netvirt: - - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml deleted file mode 100644 index f6f26be67..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB 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 -############################################################################## ---- -classes: - - cluster.virtual-mcp-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-odl-router -parameters: - opendaylight: - client: - ovsdb_server_iface: ptcp:6639:127.0.0.1 - ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640 - tunnel_ip: ${_param:tenant_address} - provider_mappings: physnet1:br-floating - linux: - network: - gateway: ${_param:openstack_gateway_address} - interface: - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-mesh: - enabled: true - type: bridge - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - gateway: 10.1.0.110 - use_interfaces: - - ${_param:tenant_interface} - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml deleted file mode 100644 index a0ace9601..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB 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 -############################################################################## ---- -classes: - - system.neutron.control.opendaylight.single - - cluster.virtual-mcp-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-odl-router -parameters: - neutron: - server: - backend: - router: ${_param:opendaylight_router} - haproxy: - proxy: - listen: - opendaylight-web: - type: general-service - service_name: opendaylight - binds: - - address: ${_param:cluster_vip_address} - port: 8181 - servers: - - name: odl01 - host: ${_param:opendaylight_service_host} - port: 8181 - params: ${_param:haproxy_check} - opendaylight-rest: - type: general-service - service_name: opendaylight - binds: - - address: ${_param:cluster_vip_address} - port: 8282 - servers: - - name: odl01 - host: ${_param:opendaylight_service_host} - port: 8282 - params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml deleted file mode 100644 index 231413a19..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB 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 -############################################################################## ---- -classes: - - cluster.virtual-mcp-ocata-common.openstack_gateway - - system.neutron.gateway.opendaylight.single - - cluster.virtual-mcp-ocata-odl-router -parameters: - _param: - neutron_agents: - - neutron-dhcp-agent - - neutron-metadata-agent - neutron: - gateway: - pkgs: ${_param:neutron_agents} - services: ${_param:neutron_agents} - backend: - router: ${_param:opendaylight_router} - opendaylight: - client: - ovsdb_server_iface: ptcp:6639:127.0.0.1 - ovsdb_odl_iface: tcp:${_param:opendaylight_service_host}:6640 - tunnel_ip: ${_param:tenant_address} - provider_mappings: physnet1:br-floating - linux: - network: - interface: - br-mesh: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml deleted file mode 100644 index 5be63e51b..000000000 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB 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 -############################################################################## ---- -classes: - - cluster.virtual-mcp-ocata-common.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" - opendaylight_router: odl-router_v2 - linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - network: - host: - odl01: - address: 172.16.10.111 - names: - - odl01 - - odl01.${_param:cluster_domain} -- cgit 1.2.3-korg