Merge "initial hce configuration"
diff --git a/docker/client/compose/service/jenkins.yml b/docker/client/compose/service/jenkins.yml
index 85f2006..b2f4213 100644
--- a/docker/client/compose/service/jenkins.yml
+++ b/docker/client/compose/service/jenkins.yml
@@ -30,6 +30,12 @@
volumes:
- /srv/volumes/jenkins:/var/jenkins_home
- /etc/ssl/certs/java/cacerts:/etc/ssl/certs/java/cacerts:ro
+ network:
+ default:
+ ipam:
+ driver: default
+ config:
+ - subnet: 172.29.0.0/24
linux:
system:
directory:
diff --git a/docker/host.yml b/docker/host.yml
index c3cc808..aef7a32 100644
--- a/docker/host.yml
+++ b/docker/host.yml
@@ -13,3 +13,4 @@
options:
ipv6: true
fixed-cidr-v6: fc00::/7
+ storage-driver: overlay2
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 4f12bd6..1973906 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -131,6 +131,7 @@
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods toBoolean java.lang.Boolean
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods getAt java.lang.Object java.lang.String
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods multiply java.lang.String java.lang.Number
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods minus java.lang.String java.lang.Object
- method java.io.File listFiles
- method java.lang.String concat java.lang.String
- method org.jenkinsci.plugins.workflow.steps.FlowInterruptedException getCauses
diff --git a/jenkins/client/job/deploy/update/update_mirror_image.yml b/jenkins/client/job/deploy/update/update_mirror_image.yml
index 75363db..3b34d12 100644
--- a/jenkins/client/job/deploy/update/update_mirror_image.yml
+++ b/jenkins/client/job/deploy/update/update_mirror_image.yml
@@ -22,4 +22,37 @@
default: "${_param:jenkins_salt_api_url}"
SALT_MASTER_CREDENTIALS:
type: string
- default: "salt"
\ No newline at end of file
+ default: "salt"
+ UPDATE_APTLY:
+ type: boolean
+ default: 'true'
+ UPDATE_APTLY_MIRRORS:
+ type: string
+ default: ""
+ PUBLISH_APTLY:
+ type: boolean
+ default: 'true'
+ RECREATE_APTLY_PUBLISHES:
+ type: boolean
+ default: 'false'
+ FORCE_OVERWRITE_APTLY_PUBLISHES:
+ type: boolean
+ default: 'false'
+ CLEANUP_APTLY:
+ type: boolean
+ default: 'false'
+ UPDATE_DOCKER_REGISTRY:
+ type: boolean
+ default: 'true'
+ CLEANUP_DOCKER_CACHE:
+ type: boolean
+ default: 'false'
+ UPDATE_PYPI:
+ type: boolean
+ default: 'true'
+ UPDATE_GIT:
+ type: boolean
+ default: 'true'
+ UPDATE_IMAGES:
+ type: boolean
+ default: 'true'
\ No newline at end of file
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index f4aee6c..ab7c4fd 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -205,8 +205,6 @@
branches: ${_param:salt_formulas_branches}
- name: salt
branches: ${_param:salt_formulas_branches}
- - name: salt-formulas-cookiecutter
- branches: ${_param:salt_formulas_branches}
- name: sensu
branches: ${_param:salt_formulas_branches}
- name: sentry
@@ -298,3 +296,35 @@
BRANCHES:
type: string
default: "master"
+ git-mirror-2way-salt-formulas-cookiecutter:
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
+ type: workflow-scm
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ credentials: "gerrit"
+ script: git-mirror-2way-pipeline.groovy
+ github:
+ url: "https://github.com/salt-formulas/salt-formulas-cookiecutter"
+ trigger:
+ github:
+ pollscm:
+ spec: ${_param:jenkins_pollscm_spec}
+ param:
+ SOURCE_URL:
+ type: string
+ default: "${_param:jenkins_gerrit_url}/salt-formulas/salt-formulas-cookiecutter.git"
+ TARGET_URL:
+ type: string
+ default: "https://github.com/salt-formulas/salt-formulas-cookiecutter.git"
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ BRANCHES:
+ type: string
+ default: "master"
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index baa363a..465b75d 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -10,7 +10,7 @@
architectures: amd64
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key"
pin:
- - pin: 'release a=${_param:openstack_version}'
+ - pin: 'release l=${_param:openstack_version}'
priority: 1100
package: '*'
mk_openstack:
@@ -18,6 +18,6 @@
architectures: amd64
key_url: "http://apt.mirantis.com/public.gpg"
pin:
- - pin: 'release a=${_param:linux_system_repo_mk_openstack_version}'
+ - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
priority: 1100
package: '*'
diff --git a/linux/system/repo_local/mcp/openstack.yml b/linux/system/repo_local/mcp/openstack.yml
index a25cc57..08f1e67 100644
--- a/linux/system/repo_local/mcp/openstack.yml
+++ b/linux/system/repo_local/mcp/openstack.yml
@@ -7,6 +7,6 @@
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
pin:
- - pin: 'release a=${_param:openstack_version}'
+ - pin: 'release l=${_param:openstack_version}'
priority: 1100
package: '*'
diff --git a/linux/system/single/debian.yml b/linux/system/single/debian.yml
index bb3cb54..b6d0b2b 100644
--- a/linux/system/single/debian.yml
+++ b/linux/system/single/debian.yml
@@ -8,7 +8,3 @@
package:
python-msgpack:
version: latest
- apt:
- config:
- compression-workaround:
- "Acquire::CompressionTypes::Order": "gz"
diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml
index 8de2dda..c7c583b 100644
--- a/linux/system/single/init.yml
+++ b/linux/system/single/init.yml
@@ -21,6 +21,10 @@
version: purged
mcelog:
version: latest
+ apt:
+ config:
+ compression-workaround:
+ "Acquire::CompressionTypes::Order": "gz"
kernel:
modules:
- nf_conntrack
diff --git a/openssh/server/team/members/korlowska.yml b/openssh/server/team/members/korlowska.yml
index f175273..cde10d1 100644
--- a/openssh/server/team/members/korlowska.yml
+++ b/openssh/server/team/members/korlowska.yml
@@ -11,7 +11,6 @@
email: korlowska@mirantis.com
openssh:
server:
- enabled: true
user:
korlowska:
enabled: true
diff --git a/openssh/server/team/members/miwinski.yml b/openssh/server/team/members/miwinski.yml
index 5dc9d80..676fd3c 100644
--- a/openssh/server/team/members/miwinski.yml
+++ b/openssh/server/team/members/miwinski.yml
@@ -11,7 +11,6 @@
email: miwinski@mirantis.com
openssh:
server:
- enabled: true
user:
miwinski:
enabled: true
diff --git a/openssh/server/team/members/mlos.yml b/openssh/server/team/members/mlos.yml
index 6b30817..fe7b8f4 100644
--- a/openssh/server/team/members/mlos.yml
+++ b/openssh/server/team/members/mlos.yml
@@ -11,7 +11,6 @@
email: mlos@mirantis.com
openssh:
server:
- enabled: true
user:
mlos:
enabled: true
diff --git a/openssh/server/team/members/mniedbala.yml b/openssh/server/team/members/mniedbala.yml
index 30f7f30..a4ca5c8 100644
--- a/openssh/server/team/members/mniedbala.yml
+++ b/openssh/server/team/members/mniedbala.yml
@@ -11,7 +11,6 @@
email: mniedbala@mirantis.com
openssh:
server:
- enabled: true
user:
mniedbala:
enabled: true
diff --git a/openssh/server/team/members/pruzicka.yml b/openssh/server/team/members/pruzicka.yml
index 93aca1f..d56d3d6 100644
--- a/openssh/server/team/members/pruzicka.yml
+++ b/openssh/server/team/members/pruzicka.yml
@@ -11,7 +11,6 @@
email: pruzicka@mirantis.com
openssh:
server:
- enabled: true
user:
pruzicka:
enabled: true