Merge "Revert "Change some default values for cvp jobs""
diff --git a/.releasenotes/notes/salt-control-ordered-interfaces.yaml b/.releasenotes/notes/salt-control-ordered-interfaces.yaml
new file mode 100644
index 0000000..92e21f3
--- /dev/null
+++ b/.releasenotes/notes/salt-control-ordered-interfaces.yaml
@@ -0,0 +1,32 @@
+---
+fixes:
+ - |
+ When defining interfaces for kvm-quemu VMs use sorted list of interfaces
+ to avoid random NIC assignment/name.
+
+ Fixes https://mirantis.jira.com/browse/PROD-21976
+
+ Required model change on existing deployments with MCP >= 2018.7.0, update
+ `salt:virt:nic` profiles to use list with `- name:` key instead of dict:
+
+ .. code-block:: yaml
+
+ salt:
+ virt:
+ nic:
+ default:
+ eth1:
+ bridge: br-mgm
+ eth0:
+ bridge: br-ctl
+ control:
+ - name: eth1
+ bridge: br_mgm
+ model: virtio
+ - name: eth2
+ bridge: br_ctl
+ model: virtio
+ - name: eth3
+ bridge: br_proxy
+ model: virtio
+
diff --git a/jenkins/client/job/oscore/qa.yml b/jenkins/client/job/oscore/qa.yml
index 13d0e76..f076a78 100644
--- a/jenkins/client/job/oscore/qa.yml
+++ b/jenkins/client/job/oscore/qa.yml
@@ -70,8 +70,8 @@
project:
mcp/{{oscore-qa-project}}:
branches:
- - compare_type: "PLAIN"
- name: "master"
+ - master
+ - pike
event:
patchset:
- created
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index d1dc00b..f2ef200 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -183,6 +183,7 @@
RUN_TEST_IN_DOCKER:
type: boolean
description: "Run test stage in docker environment"
+ default: 'true'
SMOKE_TEST_DOCKER_IMG:
type: string
default: "ubuntu:16.04"
diff --git a/keystone/server/fernet_rotation/cluster.yml b/keystone/server/fernet_rotation/cluster.yml
new file mode 100644
index 0000000..e09b8e9
--- /dev/null
+++ b/keystone/server/fernet_rotation/cluster.yml
@@ -0,0 +1,20 @@
+parameters:
+ keystone:
+ server:
+ tokens:
+ fernet_sync_nodes_list:
+ sync_node01:
+ name: ${_param:openstack_control_node02_hostname}
+ enabled: True
+ sync_node02:
+ name: ${_param:openstack_control_node03_hostname}
+ enabled: True
+ fernet_rotation_driver: rsync
+ linux:
+ system:
+ job:
+ keystone_fernet_rotate_rsync:
+ command: '/var/lib/keystone/fernet_keys_rotate.sh -rs >> /var/log/keystone/fernet_rotate.log 2>> /var/log/keystone/fernet_rotate.log'
+ enabled: true
+ user: keystone
+ minute: 0
diff --git a/keystone/server/fernet_rotation/single.yml b/keystone/server/fernet_rotation/single.yml
new file mode 100644
index 0000000..3aa2add
--- /dev/null
+++ b/keystone/server/fernet_rotation/single.yml
@@ -0,0 +1,13 @@
+parameters:
+ keystone:
+ server:
+ tokens:
+ fernet_rotation_driver: rsync
+ linux:
+ system:
+ job:
+ keystone_fernet_rotate_rsync:
+ command: '/var/lib/keystone/fernet_keys_rotate.sh -r >> /var/log/keystone/fernet_rotate.log 2>> /var/log/keystone/fernet_rotate.log'
+ enabled: true
+ user: keystone
+ minute: 0
diff --git a/openssh/server/team/members/pbasov.yml b/openssh/server/team/members/pbasov.yml
new file mode 100644
index 0000000..567f1cd
--- /dev/null
+++ b/openssh/server/team/members/pbasov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ pbasov:
+ enabled: true
+ name: pbasov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Pavel Basov
+ home: /home/pbasov
+ email: pbasov@mirantis.com
+ openssh:
+ server:
+ user:
+ pbasov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6cHg1SvsxWp5tD0Ee7nl4pyW9cLO/ZQYYxUYa2zSn/RWFm9BFuy1VwkJiYCIvk0lTXfKQMiO10mKm2xFC3VT0vpTSGIYDh4oxDu0FpIaTmXX3ULVdLNwWvrkHoPkIbPy1nUYlJQ+9PEh6KWkbxeYXFxVPoouWkDwshF63GrRA7Pyg2CuVn/FEA+ldSeq7mp/kkOWvlKXpJzvKXt4A/6odOCUiCnX//CWreHCnfCV3KsteyBc+UP2ql6wpEXmIIYdrOF0O3ofqRPTx6ivIOGGDuYB6e/XDivoEBPWNcLYcr9d5HKOTgRE6xF2Q1ElzpbvAY4AS+kggEjIgImiB3TxX pbasov@mirantis.com
+ user: ${linux:system:user:pbasov}
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index c2f4e28..3116d90 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -19,6 +19,7 @@
- system.openssh.server.team.members.dstremkouski
- system.openssh.server.team.members.mchernik
- system.openssh.server.team.members.hkraemer
+- system.openssh.server.team.members.pbasov
parameters:
_param:
linux_system_user_sudo: true
diff --git a/salt/control/virt.yml b/salt/control/virt.yml
index 0bbb7fa..05bf23d 100644
--- a/salt/control/virt.yml
+++ b/salt/control/virt.yml
@@ -62,4 +62,4 @@
size: 4000000
xxxxhuge:
- system:
- size: 5000000
\ No newline at end of file
+ size: 5000000
diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 381ae1a..31b8980 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -34,6 +34,9 @@
glusterfs:
source: pkg
name: salt-formula-glusterfs
+ gnocchi:
+ source: pkg
+ name: salt-formula-gnocchi
designate:
source: pkg
name: salt-formula-designate
@@ -82,6 +85,9 @@
opencontrail:
source: pkg
name: salt-formula-opencontrail
+ panko:
+ source: pkg
+ name: salt-formula-panko
python:
source: pkg
name: salt-formula-python