aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
Diffstat (limited to 'mcp')
-rw-r--r--mcp/config/scenario/defaults-x86_64.yaml1
-rw-r--r--mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j29
-rwxr-xr-xmcp/config/states/opendaylight5
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml3
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml1
6 files changed, 15 insertions, 6 deletions
diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml
index 18b0826f9..b9c407280 100644
--- a/mcp/config/scenario/defaults-x86_64.yaml
+++ b/mcp/config/scenario/defaults-x86_64.yaml
@@ -20,6 +20,7 @@ virtual:
- saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
pkg:
install:
+ - linux-generic-hwe-16.04
- salt-minion
control:
pkg:
diff --git a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
index 58f418622..2dfea5f60 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
@@ -6,16 +6,17 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
{%- import 'net_map.j2' as nm with context %}
+{%- set cluster = {'has_virtual_nodes': False} %}
{%- for node in conf.nodes %}
- {%- if node.node.type == 'baremetal' %}
- {%- set cluster_has_baremetal_nodes = True %}
+ {%- if not cluster.has_virtual_nodes and node.node.type == 'baremetal' %}
+ {%- set _ = cluster.update({'has_baremetal_nodes': True}) %}
{%- endif %}
{%- endfor %}
---
cluster:
domain: mcp-pike-ovs-novcp-ha.local
states:
-{%- if cluster_has_baremetal_nodes %}
+{%- if cluster.has_baremetal_nodes %}
- maas
- baremetal_init
{%- endif %}
@@ -24,7 +25,7 @@ cluster:
virtual:
nodes:
- cfg01
-{%- if cluster_has_baremetal_nodes %}
+{%- if cluster.has_baremetal_nodes %}
- mas01
{%- endif %}
{#- Most likely, controllers will always have the same type and number (3) #}
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index 34a2c3bd8..0b774e691 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -9,7 +9,10 @@
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
+# TODO: use service.masked state instead once salt get updated to 2017.7.0+
+salt -I 'opendaylight:server' service.mask opendaylight
salt -I 'opendaylight:server' state.sls opendaylight
+
+salt -I 'neutron:server' state.sls opendaylight.client
salt -I 'opendaylight:client' state.sls opendaylight.client
salt -I 'opendaylight:client' cmd.run 'neutron-odl-ovs-hostconfig --noovs_dpdk'
-salt -I 'neutron:server' state.sls opendaylight.client
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
index 5d6012488..3dc99983c 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
@@ -25,7 +25,7 @@ parameters:
maas_db_password: opnfv_secret
dns_server01: ${_param:opnfv_dns_server01}
single_address: ${_param:infra_maas_node01_deploy_address}
- hwe_kernel: 'ga-16.04'
+ hwe_kernel: 'hwe-16.04'
maas:
region:
salt_master_ip: ${_param:reclass_config_master}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
index 7f81d7a72..2e79f808e 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
@@ -56,3 +56,6 @@ parameters:
neutron:
gateway:
vlan_aware_vms: true
+ nova:
+ compute:
+ disk_cachemodes: file=directsync,block=none
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
index 710dee8e7..ea2275a3e 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml
@@ -25,6 +25,7 @@ parameters:
compute:
libvirt_service: libvirtd
libvirt_bin: /etc/default/libvirtd
+ disk_cachemodes: file=directsync,block=none
vncproxy_url: http://${_param:cluster_vip_address}:6080
network:
region: ${_param:openstack_region}