Merge "Add ikolodyazhny user"
diff --git a/jenkins/client/job/deploy/kqueen.yml b/jenkins/client/job/deploy/kqueen.yml
index 0214da7..4d784d2 100644
--- a/jenkins/client/job/deploy/kqueen.yml
+++ b/jenkins/client/job/deploy/kqueen.yml
@@ -52,7 +52,7 @@
default: "eu-central-1"
AWS_API_CREDENTIALS:
type: string
- default: "aws-credentials"
+ default: "kqueen-aws"
AWS_SSH_KEY:
type: string
default: "jenkins-mk"
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 36e1dc0..0fdbbfe 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -9,7 +9,7 @@
discard:
build:
keep_num: 50
- concurrent: false
+ concurrent: true
scm:
type: git
url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
diff --git a/neutron/client/service/ironic.yml b/neutron/client/service/ironic.yml
index 17d3e6f..6c5744a 100644
--- a/neutron/client/service/ironic.yml
+++ b/neutron/client/service/ironic.yml
@@ -1,6 +1,11 @@
classes:
- service.neutron.client
parameters:
+ _param:
+ # TODO Remove below variables with typo in next release
+ openstack_baremetal_neutron_subnet_cidr: ${_param:openstack_baremeta_neutron_subnet_cidr}
+ openstack_baremetal_neutron_subnet_allocation_start: ${_param:openstack_baremeta_neutron_subnet_allocation_start}
+ openstack_baremetal_neutron_subnet_allocation_end: ${_param:openstack_baremeta_neutron_subnet_allocation_end}
neutron:
client:
server:
@@ -16,8 +21,8 @@
port_security_enabled: false
subnet:
baremetal-subnet:
- cidr: ${_param:openstack_baremeta_neutron_subnet_cidr}
+ cidr: ${_param:openstack_baremetal_neutron_subnet_cidr}
allocation_pools:
- - start: ${_param:openstack_baremeta_neutron_subnet_allocation_start}
- end: ${_param:openstack_baremeta_neutron_subnet_allocation_end}
+ - start: ${_param:openstack_baremetal_neutron_subnet_allocation_start}
+ end: ${_param:openstack_baremetal_neutron_subnet_allocation_end}
enable_dhcp: true