Merge "Add template for openstack promotion job"
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 856eec5..c1d600c 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -19,30 +19,41 @@
password: ${_param:jenkins_client_password}
plugin:
artifactory: {}
+ blueocean: {}
build-blocker-plugin: {}
build-monitor-plugin: {}
+ build-timeout: {}
build-user-vars-plugin: {}
categorized-view: {}
+ copyartifact: {}
description-setter: {}
discard-old-build: {}
docker-workflow: {}
email-ext: {}
+ envinject: {}
extended-choice-parameter: {}
extensible-choice-parameter: {}
gerrit-trigger: {}
git: {}
+ github: {}
heavy-job: {}
jobConfigHistory: {}
jira: {}
ldap: {}
+ lockable-resources: {}
matrix-auth: {}
monitoring: {}
+ multiple-scms: {}
performance: {}
+ permissive-script-security: {}
pipeline-utility-steps: {}
+ prometheus: {}
rebuild: {}
simple-theme-plugin: {}
slack: {}
+ ssh-agent: {}
test-stability: {}
+ throttle-concurrents: {}
workflow-cps: {}
workflow-remote-loader: {}
workflow-scm-step:
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index d2f1199..37f0543 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -54,6 +54,7 @@
- name: heketi
- name: helm
- name: horizon
+ - name: hubble
- name: influxdb
- name: iptables
- name: ironic
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index 9614d61..ee8462a 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -1,4 +1,5 @@
classes:
+- service.docker.host
- service.haproxy.proxy.single
- service.keepalived.cluster.single
- service.opencontrail.control.analytics
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 02ab75e..10c72ee 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -1,4 +1,5 @@
classes:
+- service.docker.host
- service.keepalived.cluster.single
- service.opencontrail.control.control
- system.haproxy.proxy.listen.opencontrail.control
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index a4fae18..df551ef 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -1,4 +1,5 @@
classes:
+- service.docker.host
- service.opencontrail.control.single
- service.haproxy.proxy.single
parameters:
diff --git a/openssh/server/team/members/ohryhorov.yml b/openssh/server/team/members/ohryhorov.yml
new file mode 100644
index 0000000..c58076e
--- /dev/null
+++ b/openssh/server/team/members/ohryhorov.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ ohryhorov:
+ enabled: true
+ name: ohryhorov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Oleh Hryhorov
+ home: /home/ohryhorov
+ email: ohryhorov@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ ohryhorov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDURrVLvo44rOSe/2GBh69SPS06Jam21dJrunM9TzuxcHkw7u/rVLMA+pDMMwu/x2n8fFkW7wrd3/6QH7cLOGt1Xw4PDfFA17ZGmV7HwZ1XOeoux2+47TFkGeHyeHOqf7xKMW4o35tKDXd5uipW9opl7+Zm/l7ucd6TKnGjh9vA3nD9xqF8Gxb6qvY7W35EFMPAwU9sK9lMwM/LkuUJirEP11sIK38OoEC2aysNtXZyKdQ9LgmBWZGbaCod0LzgAJd29zQOxWOHHWOE7PK4zHVWYN3AxfiIWSg2mxqARMnqZpPulqbgwVETxLsJJSnPOvvTwoVggimxXh1HPUI7wUnb ohryhorov@ohryhorov-pc
+ user: ${linux:system:user:ohryhorov}
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 89870b0..0ad8691 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -6,6 +6,7 @@
- system.openssh.server.team.members.iudovichenko
- system.openssh.server.team.members.vdrok
- system.openssh.server.team.members.ikolodyazhny
+- system.openssh.server.team.members.ohryhorov
parameters:
_param:
linux_system_user_sudo: true