Merge "Add remote_agent"
diff --git a/designate/server/backend/bind.yml b/designate/server/backend/bind.yml
index 2b40424..c057eb7 100644
--- a/designate/server/backend/bind.yml
+++ b/designate/server/backend/bind.yml
@@ -1,15 +1,18 @@
parameters:
+ _param:
+ designate_bind9_rndc_algorithm: hmac-sha512
designate:
server:
backend:
bind9:
rndc_key: "${_param:designate_bind9_rndc_key}"
+ rndc_algorithm: "${_param:designate_bind9_rndc_algorithm}"
bind:
server:
key:
designate:
secret: "${_param:designate_bind9_rndc_key}"
- algorithm: hmac-sha512
+ algorithm: "${_param:designate_bind9_rndc_algorithm}"
allow_new_zones: true
query: true
control:
@@ -33,4 +36,4 @@
key:
designate:
secret: "${_param:designate_bind9_rndc_key}"
- algorithm: hmac-sha512
+ algorithm: "${_param:designate_bind9_rndc_algorithm}"
diff --git a/docker/swarm/stack/devops_portal.yml b/docker/swarm/stack/devops_portal.yml
index 91bca12..430c329 100644
--- a/docker/swarm/stack/devops_portal.yml
+++ b/docker/swarm/stack/devops_portal.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_devops_portal_replicas: 1
- docker_image_devops_portal: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/devops-portal:latest
+ docker_image_devops_portal: docker-prod-virtual.docker.mirantis.net/mirantis/oss/devops-portal:latest
docker:
client:
stack:
diff --git a/docker/swarm/stack/rundeck.yml b/docker/swarm/stack/rundeck.yml
index a4ec24b..322a285 100644
--- a/docker/swarm/stack/rundeck.yml
+++ b/docker/swarm/stack/rundeck.yml
@@ -1,7 +1,7 @@
parameters:
_param:
docker_rundeck_replicas: 1
- docker_image_rundeck: docker-sandbox.sandbox.mirantis.net/ikharin/oss/rundeck:2.7.3-1
+ docker_image_rundeck: docker-prod-virtual.docker.mirantis.net/mirantis/oss/rundeck:latest
docker:
client:
stack:
diff --git a/haproxy/proxy/listen/kubernetes/apiserver.yml b/haproxy/proxy/listen/kubernetes/apiserver.yml
index a45a71a..b35d1be 100644
--- a/haproxy/proxy/listen/kubernetes/apiserver.yml
+++ b/haproxy/proxy/listen/kubernetes/apiserver.yml
@@ -21,4 +21,7 @@
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 443
- params: check
\ No newline at end of file
+ params: check
+ timeout:
+ server: 10m
+ client: 10m
diff --git a/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml b/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml
index a365c51..7211507 100644
--- a/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml
+++ b/haproxy/proxy/listen/kubernetes/apiserver_insecure.yml
@@ -20,6 +20,9 @@
host: ${_param:cluster_node03_address}
port: 8080
params: check
+ timeout:
+ server: 10m
+ client: 10m
k8s_cluster_localhost:
type: kubernetes
binds:
@@ -37,4 +40,7 @@
- name: ${_param:cluster_node03_hostname}
host: ${_param:cluster_node03_address}
port: 8080
- params: check
\ No newline at end of file
+ params: check
+ timeout:
+ server: 10m
+ client: 10m
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index d216e9d..85b95c7 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -25,6 +25,8 @@
dist: trusty
- name: swift
dist: trusty
+ - name: ironic
+ dist: trusty
- name: ceilometer
dist: xenial
- name: cinder
@@ -45,6 +47,8 @@
dist: xenial
- name: swift
dist: xenial
+ - name: ironic
+ dist: xenial
template:
discard:
build:
@@ -117,4 +121,4 @@
default: 'true'
UPLOAD_APTLY:
type: boolean
- default: 'true'
\ No newline at end of file
+ default: 'true'
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 0eec086..1fbee1e 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -129,6 +129,8 @@
dist: trusty
- name: ntp
dist: trusty
+ - name: octavia
+ dist: trusty
- name: opencontrail
dist: trusty
- name: openldap
@@ -317,6 +319,8 @@
dist: xenial
- name: ntp
dist: xenial
+ - name: octavia
+ dist: xenial
- name: opencontrail
dist: xenial
- name: openldap
diff --git a/jenkins/client/job/deploy/lab/mk/cloud.yml b/jenkins/client/job/deploy/lab/mk/cloud.yml
index e6fb6d5..a79414b 100644
--- a/jenkins/client/job/deploy/lab/mk/cloud.yml
+++ b/jenkins/client/job/deploy/lab/mk/cloud.yml
@@ -59,6 +59,9 @@
STACK_REUSE:
type: boolean
default: 'false'
+ STACK_COMPUTE_COUNT:
+ type: string
+ default: '2'
STACK_TEMPLATE_URL:
type: string
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 75c63a9..1ddd863 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -58,7 +58,7 @@
default: 'false'
STACK_CLEANUP_JOB:
type: string
- default: 'deploy-heat-cleanup'
+ default: 'deploy-stack-cleanup'
# heat
HEAT_STACK_ENVIRONMENT:
type: string
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 3869b4a..cf39dbd 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -48,6 +48,7 @@
- name: horizon
- name: influxdb
- name: iptables
+ - name: ironic
- name: isc-dhcp
- name: java
- name: jenkins
@@ -77,6 +78,7 @@
- name: nodejs
- name: nova
- name: ntp
+ - name: octavia
- name: opencontrail
- name: openldap
- name: openssh
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 1e51afb..68792d4 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -47,6 +47,7 @@
- name: horizon
- name: influxdb
- name: iptables
+ - name: ironic
- name: isc-dhcp
- name: java
- name: jenkins
@@ -76,6 +77,7 @@
- name: nodejs
- name: nova
- name: ntp
+ - name: octavia
- name: opencontrail
- name: openldap
- name: openssh