summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-09-13 14:19:52 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-09-13 14:25:38 +0400
commita40e50c04f27e322e3b4f4e96fe61b78f420937d (patch)
tree152ddf7e4c9a5505d19a8e27f1caf978335c5ce7
parent13325ade9e4d2ea1046062e4efce9c54c8d877cd (diff)
[ha] Get OVS 2.9 & DPDK 17.11 from UCA repo
* to be compatible with HWE kernel * make neutron balancing to RR back * turn off glance v1 api support (doesn't relevant for now) Change-Id: I916aae10f523be339c20de32218ce03c245afe72 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rwxr-xr-xmcp/config/states/openstack_ha4
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j23
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j22
3 files changed, 1 insertions, 8 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 0f6858f1e..499c1d357 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -82,7 +82,3 @@ dashboard_host=$(salt -C 'I@nginx:server and *01*' --out=yaml cp.push \
upload_path='certs/os_cacert' | cut -d':' -f1)
cd /etc/ssl/certs && \
ln -sf "/var/cache/salt/master/minions/${dashboard_host}/files/certs/os_cacert"
-
-# glance v1 api is required by orchestra tests
-salt -I 'glance:server' ini.set_option /etc/glance/glance-api.conf '{DEFAULT: {enable_v1_api: True}}'
-salt -I 'glance:server' service.restart glance-api
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index a518c6e11..120fc9ff7 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -153,9 +153,6 @@ parameters:
listen:
heat_cloudwatch_api:
enabled: false
- neutron_api:
- # Set source balancing
- type: heat
barbican:
server:
ks_notifications_enable: true
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index dc286452b..79eafcd10 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -256,7 +256,7 @@ parameters:
pin:
- pin: 'release o=Canonical'
priority: 1200
- package: 'python-pymysql libvirt* *qemu*'
+ package: 'libvirt* qemu* openvswitch* python-openvswitch ovn* dpdk* libdpdk*'
{%- if 'aarch64' in nm.cluster.arch %}
armband_3: # Should be in sync with the repo config generated via curtin/MaaS
source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main"