Merge "typo fix in aptly mirror"
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/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