Merge "Change disk size for stacklight nodes"
diff --git a/aptly/server/docker.yml b/aptly/server/docker.yml
index 4e70a92..c33f169 100644
--- a/aptly/server/docker.yml
+++ b/aptly/server/docker.yml
@@ -8,13 +8,15 @@
aptly_gpg_private_key: none
aptly_server_mirror_sources: false
aptly_server_mirror_ubuntu_sources: ${_param:aptly_server_mirror_sources}
+ docker_image_aptly:
+ base: tcpcloud/aptly
aptly:
server:
enabled: true
secure: ${_param:aptly_server_secure}
source:
engine: docker
- image: tcpcloud/aptly
+ image: ${_param:docker_image_aptly:base}
user:
uid: 501
gid: 501
diff --git a/aptly/server/mirror/debian/aptly.yml b/aptly/server/mirror/debian/aptly.yml
index d4e4a61..ce05ee6 100644
--- a/aptly/server/mirror/debian/aptly.yml
+++ b/aptly/server/mirror/debian/aptly.yml
@@ -3,7 +3,7 @@
mirror_aptly_source: http://repo.aptly.info/
mirror_aptly_distribution: squeeze
mirror_aptly_components: main
- mirrot_aptly_gpgkeys:
+ mirror_aptly_gpgkeys:
- 9C7DE460
aptly:
server:
diff --git a/devops_portal/service/rundeck.yml b/devops_portal/service/rundeck.yml
index 946e0c2..542974e 100644
--- a/devops_portal/service/rundeck.yml
+++ b/devops_portal/service/rundeck.yml
@@ -1,4 +1,8 @@
parameters:
+ _param:
+ oss_rundeck_user: ${_param:rundeck_admin_username}
+ oss_rundeck_password: ${_param:rundeck_admin_password}
+ oss_rundeck_token: ${_param:rundeck_admin_token}
devops_portal:
config:
service:
@@ -10,9 +14,9 @@
proxy_read_timeout: 300
send_timeout: 300
credentials:
- username: ${_param:rundeck_admin_username}
- password: ${_param:rundeck_admin_password}
- token: ${_param:rundeck_admin_token}
+ username: ${_param:oss_rundeck_user}
+ password: ${_param:oss_rundeck_password}
+ token: ${_param:oss_rundeck_token}
endpoint:
address: ${_param:haproxy_rundeck_bind_host}
port: ${_param:haproxy_rundeck_bind_port}
diff --git a/devops_portal/service/security_monkey.yml b/devops_portal/service/security_monkey.yml
index 9fce180..36b79f6 100644
--- a/devops_portal/service/security_monkey.yml
+++ b/devops_portal/service/security_monkey.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ oss_security_monkey_user: ${_param:security_monkey_user}
+ oss_security_monkey_password: ${_param:security_monkey_password}
devops_portal:
config:
service:
@@ -14,5 +17,5 @@
port: ${_param:security_monkey_bind_port}
https: ${_param:security_monkey_ssl:enabled}
credentials:
- username: ${_param:security_monkey_user}
- password: ${_param:security_monkey_password}
+ username: ${_param:oss_security_monkey_user}
+ password: ${_param:oss_security_monkey_password}
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 6afd67e..12a7e9f 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -99,6 +99,7 @@
- staticMethod java.util.regex.Pattern quote java.lang.String
- staticMethod java.util.stream.Collectors joining java.lang.CharSequence
- staticMethod jenkins.model.Jenkins getInstance
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods asBoolean java.util.regex.Matcher
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods collect java.util.Map groovy.lang.Closure
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods eachFile java.io.File groovy.io.FileType groovy.lang.Closure
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods find java.util.Collection groovy.lang.Closure
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
index f78ceac..1b09ef0 100644
--- a/openssh/server/team/support.yml
+++ b/openssh/server/team/support.yml
@@ -86,8 +86,6 @@
- ${linux:system:user:nkabanova:name}
- ${linux:system:user:rsoto:name}
- ${linux:system:user:rsafonov:name}
- - ${linux:system:user:smachtmes:name}
- - ${linux:system:user:zkhurasani:name}
# L2OPS
- ${linux:system:user:aepifanov:name}
- ${linux:system:user:apetrenko:name}
@@ -104,12 +102,9 @@
- ${linux:system:user:oliemieshko:name}
- ${linux:system:user:sovsianikov:name}
- ${linux:system:user:pmichalec:name}
- - ${linux:system:user:pmathews:name}
- ${linux:system:user:pcizinsky:name}
- ${linux:system:user:osmola:name}
- - ${linux:system:user:cade:name}
- ${linux:system:user:jmosher:name}
- - ${linux:system:user:ecantwell:name}
- ${linux:system:user:lmercl:name}
sudo:
enabled: true