diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-04 09:46:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-04 09:46:19 +0000 |
| commit | 81ee9b180ab11507492783aa1d62927faa9876df (patch) | |
| tree | e42d033be541ad145f2c219bca35fb4946a403fa /mcp/reclass | |
| parent | a384976c68f07017bca993cdbe578061ec539890 (diff) | |
| parent | 109b2b7951ee8aab7bc9d58c9fb3aec99110cf33 (diff) | |
Merge "[virtual] Update dpdk scenario with pike"
Diffstat (limited to 'mcp/reclass')
5 files changed, 7 insertions, 9 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml index 458765020..44c1407c5 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml @@ -8,7 +8,6 @@ --- classes: - system.linux.system.lowmem - - system.linux.system.repo.mcp.extra - service.nfs.server - system.mongodb.server.single - system.mongodb.server.database.ceilometer @@ -91,12 +90,10 @@ parameters: vncproxy_url: http://${_param:cluster_vip_address}:6080 workers: 1 pkgs: - - nova-common - - nova-novncproxy - - novnc - nova-api - nova-conductor - nova-consoleauth + - nova-novncproxy - nova-scheduler - python-novaclient horizon: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml index 7d5313444..9822de7d3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml @@ -6,8 +6,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -classes: - - system.linux.system.repo.mcp.extra parameters: _param: primary_interface: ${_param:opnfv_fn_vm_secondary_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml index e3ae40505..cf35a2b20 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml @@ -97,7 +97,7 @@ parameters: system: repo: uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/pike main" + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" architectures: amd64 key_id: EC4926EA key_server: keyserver.ubuntu.com diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml index 72fe43a84..fdb421918 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml @@ -7,8 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - system.nova.compute.nfv.hugepages - system.neutron.compute.nfv.dpdk - cluster.virtual-mcp-pike-common.openstack_compute @@ -20,6 +18,11 @@ parameters: tenant_network_types: ${_param:neutron_tenant_network_types} linux: network: + dpdk_pkgs: + - dpdk + - dpdk-dev + - dpdk-igb-uio-dkms + - dpdk-rte-kni-dkms interface: dpdk0: name: ${_param:dpdk0_name} diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system -Subproject 58cebbd45db86c92e89abd33b98827863306eee +Subproject 79f99eb5c290b346bb663ec8142eb3eafeb0a7e |