Merge "Allow to parse string in xml"
diff --git a/devops_portal/service/jenkins.yml b/devops_portal/service/jenkins.yml
index 2a5dbc9..07c001d 100644
--- a/devops_portal/service/jenkins.yml
+++ b/devops_portal/service/jenkins.yml
@@ -12,3 +12,6 @@
address: ${_param:haproxy_jenkins_bind_host}
port: ${_param:haproxy_jenkins_bind_port}
https: ${_param:haproxy_jenkins_ssl:enabled}
+ credentials:
+ username: ${_param:oss_jenkins_user}
+ password: ${_param:oss_jenkins_password}
diff --git a/docker/swarm/stack/jenkins/master.yml b/docker/swarm/stack/jenkins/master.yml
index e974dee..96d4e10 100644
--- a/docker/swarm/stack/jenkins/master.yml
+++ b/docker/swarm/stack/jenkins/master.yml
@@ -6,6 +6,8 @@
jenkins_master_extra_opts: ""
jenkins_master_executors_num: 4
jenkins_master_max_concurent_requests: 40
+ oss_jenkins_user: admin
+ oss_jenkins_password: password
docker:
client:
stack:
diff --git a/grafana/client/datasource/prometheus.yml b/grafana/client/datasource/prometheus.yml
index c4835ef..681b9df 100644
--- a/grafana/client/datasource/prometheus.yml
+++ b/grafana/client/datasource/prometheus.yml
@@ -2,6 +2,7 @@
_param:
grafana_prometheus_is_default: true
grafana_prometheus_ds_name: prometheus
+ grafana_prometheus_address: ${_param:stacklight_monitor_address}
grafana:
client:
datasource:
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index bc7e847..0544f80 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -64,18 +64,24 @@
SPT_SSH_USER:
type: string
default: "root"
- SPT_FLOATING_NETWORK:
+ FLOATING_NETWORK:
type: string
default: ""
SPT_IMAGE:
type: string
default: ""
- SPT_USER:
+ SPT_IMAGE_USER:
type: string
default: ""
SPT_FLAVOR:
type: string
default: ""
- SPT_AVAILABILITY_ZONE:
+ AVAILABILITY_ZONE:
type: string
default: "nova"
+ RALLY_IMAGE:
+ type: string
+ default: "cirros"
+ RALLY_FLAVOR:
+ type: string
+ default: "m1.tiny"
diff --git a/keystone/client/service/barbican.yml b/keystone/client/service/barbican.yml
index 70b6054..497eb50 100644
--- a/keystone/client/service/barbican.yml
+++ b/keystone/client/service/barbican.yml
@@ -7,6 +7,7 @@
identity:
roles:
- creator
+ - key-manager:service-admin
project:
service:
user:
@@ -16,6 +17,7 @@
roles:
- admin
- creator
+ - key-manager:service-admin
service:
barbican:
type: key-manager