Merge "Collapse Mirantis apt pining opts"
diff --git a/barbican/client/v1/octavia.yml b/barbican/client/v1/octavia.yml
index 931bef0..99cb29e 100644
--- a/barbican/client/v1/octavia.yml
+++ b/barbican/client/v1/octavia.yml
@@ -14,6 +14,7 @@
cloud_name: octavia_identity
secrets:
OctaviaAmphoraSecret:
+ cloud_name: octavia_identity
type: certificate
algorithm: RSA
payload_content_type: application/octet-stream
@@ -23,4 +24,5 @@
acl:
OctaviaAmphoraSecret:
octavia:
+ cloud_name: octavia_identity
enabled: True
diff --git a/ironic/conductor/storage/cinder.yml b/ironic/conductor/storage/cinder.yml
index 8e5ea12..33af09a 100644
--- a/ironic/conductor/storage/cinder.yml
+++ b/ironic/conductor/storage/cinder.yml
@@ -1,6 +1,9 @@
parameters:
ironic:
conductor:
+ enabled_storage_interfaces:
+ - noop
+ - cinder
cinder:
auth_strategy: keystone
auth_type: password
diff --git a/jenkins/client/job/security/openscap.yml b/jenkins/client/job/security/openscap.yml
index 74bc15a..94baf0f 100644
--- a/jenkins/client/job/security/openscap.yml
+++ b/jenkins/client/job/security/openscap.yml
@@ -29,7 +29,7 @@
- oval
DASHBOARD_API_URL:
type: string
- default: ""
+ default: "http://oscore-bandit.vm.mirantis.net:8090/api"
description: "The WORP api base url. Mandatory if UPLOAD_TO_DASHBOARD is true"
SALT_MASTER_URL:
type: string
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 3003ebb..eed3084 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -1,7 +1,6 @@
parameters:
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
- cvp_sanity_default_repo: "https://github.com/Mirantis/cvp-sanity-checks"
jenkins:
client:
view:
@@ -214,7 +213,7 @@
default: "salt"
TESTS_REPO:
type: string
- default: "${_param:cvp_sanity_default_repo}"
+ default: ""
description: Url for cvp-sanity-checks
TESTS_SETTINGS:
type: string
@@ -222,7 +221,7 @@
description: e.g. skipped_nodes=nal01.local.com,ntw01.local.com
TESTS_SET:
type: string
- default: "cvp_checks/tests/"
+ default: "cvp-sanity/cvp_checks/tests"
description: "Leave as is for full run or add a filename, e.g. _default_path_/test_mtu.py"
PROXY:
type: string
@@ -484,7 +483,7 @@
default: "salt"
TESTS_REPO:
type: string
- default: "https://github.com/Mirantis/cvp-spt"
+ default: ""
description: Url for cvp-spt repository
TESTS_SETTINGS:
type: string
@@ -492,7 +491,7 @@
description: "Additional environment variables to export, e.g. image_name, networks, HW_NODES"
TESTS_SET:
type: string
- default: "cvp_spt/tests/"
+ default: "cvp-spt/cvp_spt/tests"
description: "Leave as is for full run or add a filename, e.g. _default_path_/test_glance.py"
PROXY:
type: string
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 5d73cf9..fcca6b6 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -58,7 +58,7 @@
kubernetes_sriov_source_hash: md5=cd9ea01e80d260218260314447c23b30
kubernetes_cniplugins_source: ${_param:kubernetes_cniplugins_repo}/containernetworking-plugins_v0.7.2-151-g1d23302.tar.gz
kubernetes_cniplugins_source_hash: md5=bb42444166a89ef6832529e9e39d000d
- kubernetes_dashboard_image: ${_param:kubernetes_dashboard_repo}/kubernetes-dashboard-amd64:v1.10.0-4
+ kubernetes_dashboard_image: ${_param:kubernetes_dashboard_repo}/kubernetes-dashboard-amd64:v1.10.1-2
kubernetes_telegraf_image: ${_param:mcp_docker_registry}/openstack-docker/telegraf:2018.8.0
kubernetes_coredns_image: ${_param:kubernetes_coredns_repo}/coredns:v1.2.6-4
kubernetes_ingressnginx_controller_image: ${_param:kubernetes_ingressnginx_repo}/nginx-ingress-controller-amd64:nginx-0.21.0-3
diff --git a/openssh/server/team/maintenance.yml b/openssh/server/team/maintenance.yml
index 0bceaad..110b085 100644
--- a/openssh/server/team/maintenance.yml
+++ b/openssh/server/team/maintenance.yml
@@ -5,6 +5,7 @@
- system.openssh.server.team.members.vkhlyunev
- system.openssh.server.team.members.dtsapikov
- system.openssh.server.team.members.rlubianyi
+- system.openssh.server.team.members.msamoylov
parameters:
_param:
linux_system_user_sudo: true
diff --git a/openssh/server/team/members/msamoylov.yml b/openssh/server/team/members/msamoylov.yml
new file mode 100644
index 0000000..70ddb80
--- /dev/null
+++ b/openssh/server/team/members/msamoylov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ msamoylov:
+ email: msamoylov@mirantis.com
+ enabled: true
+ full_name: Mikhail Samoylov
+ home: /home/msamoylov
+ name: msamoylov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ msamoylov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvWBvRN2uYS0eolhaXRbsp8w5QM0B4ebpuTK3cT60ZLnxr99HrzBqwH6KjGkt9/V0xdUo6wuSjh+r6xuCUae7owC6T8fnUYuVt6Fyd9Wh33tjMIfj+EZBZLrmQW3X0OqwY1x3/YIzzfLlrtF9JwHvGcbt9nv7h+2jAh0iPB8p+1ITrzkJ9UZK6LSmeB1w6HVqJDqLZuz/R6pyRciSbIc5uTVXy8RJAp4Tsak6SDXJcZMm8WQT5g2ZHVRriVmca/Iy++xNuPIqL3TwX9y3KHksQY2E3yiOURn3b5hovVXHuTuRLMZo4yuT4nKSRylsRnPX0HH9cdgI6/DIRL+52HLAv msamoylov@msamoylov
+ user: ${linux:system:user:msamoylov}