Merge pull request #238 from damjanek/master
Add nova aggregates support
diff --git a/aptly/server/mirror/ubuntu/trusty/glusterfs.yml b/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
index 2d3fbaf..b83c49f 100644
--- a/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
@@ -1,6 +1,4 @@
parameters:
- _param:
- apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,6 +10,6 @@
gpgkeys:
- 3FE869A9
publisher:
- component: main
+ component: glusterfs
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/nightly
diff --git a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
index 79a618a..da48431 100644
--- a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
@@ -1,6 +1,4 @@
parameters:
- _param:
- apt_mk_version: stable
aptly:
server:
mirror:
@@ -12,6 +10,6 @@
gpgkeys:
- 3FE869A9
publisher:
- component: main
+ component: glusterfs
distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-xenial/nightly
diff --git a/docker/swarm/stack/monitoring.yml b/docker/swarm/stack/monitoring.yml
index fdd095a..46a2845 100644
--- a/docker/swarm/stack/monitoring.yml
+++ b/docker/swarm/stack/monitoring.yml
@@ -1,5 +1,7 @@
-include:
+classes:
+- service.prometheus.server.container
- service.prometheus.alertmanager.container
+- service.prometheus.pushgateway.container
parameters:
docker:
client:
@@ -9,10 +11,11 @@
monitoring:
driver: overlay
driver_opts:
- encrypted: true
+ encrypted: 1
service:
alertmanager:
- network: monitoring
+ networks:
+ - monitoring
deploy:
replicas: 2
restart_policy:
@@ -21,14 +24,15 @@
ports:
- 15011:${prometheus:alertmanager:bind:port}
volumes:
- - /srv/volumes/prometheus:/opt/prometheus/config
+ - /srv/volumes/prometheus:/opt/alertmanager/config
environment:
config_dir: /opt/alertmanager/config
bind_port: ${prometheus:alertmanager:bind:port}
bind_address: ${prometheus:alertmanager:bind:address}
- discovery_domain: 'prometheus_alertmanager'
+ discovery_domain: 'monitoring_alertmanager'
pushgateway:
- network: monitoring
+ networks:
+ - monitoring
deploy:
replicas: 2
restart_policy:
@@ -37,7 +41,8 @@
ports:
- 15012:9091
server:
- network: monitoring
+ networks:
+ - monitoring
deploy:
replicas: 1
restart_policy:
@@ -57,4 +62,4 @@
storage_local_memory_chunks: ${prometheus:server:storage:local:memory_chunks}
storage_local_max_chunks_to_persist: ${prometheus:server:storage:local:max_chunks_to_persist}
storage_local_num_fingerprint_mutexes: ${prometheus:server:storage:local:num_fingerprint_mutexes}
- discovery_domain: 'prometheus_alertmanager'
+ discovery_domain: 'monitoring_alertmanager'
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 094ae79..5e6665c 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -159,6 +159,8 @@
dist: trusty
- name: rsyslog
dist: trusty
+ - name: rundeck
+ dist: trusty
- name: sahara
dist: trusty
- name: salt
@@ -335,6 +337,8 @@
dist: xenial
- name: rsync
dist: xenial
+ - name: rundeck
+ dist: xenial
- name: rsyslog
dist: xenial
- name: sahara
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 0fc26f7..17dca28 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -19,6 +19,9 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
credentials: "gerrit"
script: lab-pipeline.groovy
+ trigger:
+ timer:
+ spec: "{{timer}}"
param:
# deployments and test settings
STACK_TYPE:
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index 7e05368..8e82f76 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -35,14 +35,17 @@
install: core,openstack,contrail
stack_type: heat
test: openstack
+ timer: "H H(0-6) * * *"
- lab: virtual_mcp10_dvr
install: core,openstack,dvr
stack_type: heat
test: openstack
+ timer: "H H(0-6) * * *"
- lab: virtual_mcp10_ovs
install: core,openstack,ovs
stack_type: heat
test: openstack
+ timer: "H H(0-6) * * *"
# mcp11
- lab: virtual_mcp11_contrail
install: core,openstack,contrail
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 7bb0dac..2f1f49a 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -1,6 +1,11 @@
parameters:
jenkins:
client:
+ view:
+ Docker:
+ enabled: true
+ type: ListView
+ include_regex: ".*-docker-.*"
job_template:
docker-build-image:
name: docker-build-image-{{name}}-{{branch}}
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 75ba8bf..a26472b 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -49,6 +49,18 @@
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
+ - buildname: oc666
+ os: ubuntu
+ dist: trusty
+ branch: master
+ ppa: mirantis-opencontrail/opencontrail-master
+ upload_source_package: false
+ - buildname: oc666
+ os: ubuntu
+ dist: xenial
+ branch: master
+ ppa: mirantis-opencontrail/opencontrail-master
+ upload_source_package: false
template:
discard:
build:
diff --git a/keystone/client/service/murano.yml b/keystone/client/service/murano.yml
index 4cb6211..5e65038 100644
--- a/keystone/client/service/murano.yml
+++ b/keystone/client/service/murano.yml
@@ -12,19 +12,19 @@
is_admin: true
password: ${_param:keystone_murano_password}
email: ${_param:admin_email}
- service:
- murano:
- type: application-catalog
- description: Application Catalog for OpenStack
- endpoints:
- - region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
- public_protocol: ${_param:cluster_public_protocol}
- public_port: 8082
- public_path: ''
- internal_address: ${_param:murano_service_host}
- internal_port: 8082
- internal_path: ''
- admin_address: ${_param:murano_service_host}
- admin_port: 8082
- admin_path: ''
+ service:
+ murano:
+ type: application-catalog
+ description: Application Catalog for OpenStack
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:cluster_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 8082
+ public_path: ''
+ internal_address: ${_param:murano_service_host}
+ internal_port: 8082
+ internal_path: ''
+ admin_address: ${_param:murano_service_host}
+ admin_port: 8082
+ admin_path: ''
diff --git a/keystone/client/service/radosgw-s3.yml b/keystone/client/service/radosgw-s3.yml
index 9b434af..6b0b764 100644
--- a/keystone/client/service/radosgw-s3.yml
+++ b/keystone/client/service/radosgw-s3.yml
@@ -12,19 +12,19 @@
is_admin: true
password: ${_param:keystone_swift_password}
email: ${_param:admin_email}
- service:
- radosgw-s3:
- type: s3
- description: S3 Service (radosgw)
- endpoints:
- - region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
- public_protocol: ${_param:cluster_public_protocol}
- public_port: 8081
- public_path: '/' # /$(tenant_id)s
- internal_address: ${_param:radosgw_service_host}
- internal_port: 8081
- internal_path: '/'
- admin_address: ${_param:radosgw_service_host}
- admin_port: 8081
- admin_path: '/'
+ service:
+ radosgw-s3:
+ type: s3
+ description: S3 Service (radosgw)
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:cluster_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 8081
+ public_path: '/' # /$(tenant_id)s
+ internal_address: ${_param:radosgw_service_host}
+ internal_port: 8081
+ internal_path: '/'
+ admin_address: ${_param:radosgw_service_host}
+ admin_port: 8081
+ admin_path: '/'
diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index 82d311f..52c911c 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -12,19 +12,19 @@
is_admin: true
password: ${_param:keystone_swift_password}
email: ${_param:admin_email}
- service:
- radosgw-swift:
- type: object-store
- description: Swift Service (radosgw)
- endpoints:
- - region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
- public_protocol: ${_param:cluster_public_protocol}
- public_port: 8081
- public_path: '/swift/v1' # /$(tenant_id)s
- internal_address: ${_param:radosgw_service_host}
- internal_port: 8081
- internal_path: '/swift/v1'
- admin_address: ${_param:radosgw_service_host}
- admin_port: 8081
- admin_path: '/swift/v1'
+ service:
+ radosgw-swift:
+ type: object-store
+ description: Swift Service (radosgw)
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:cluster_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 8081
+ public_path: '/swift/v1' # /$(tenant_id)s
+ internal_address: ${_param:radosgw_service_host}
+ internal_port: 8081
+ internal_path: '/swift/v1'
+ admin_address: ${_param:radosgw_service_host}
+ admin_port: 8081
+ admin_path: '/swift/v1'
diff --git a/keystone/client/service/sahara.yml b/keystone/client/service/sahara.yml
index 0dbb136..d727049 100644
--- a/keystone/client/service/sahara.yml
+++ b/keystone/client/service/sahara.yml
@@ -12,19 +12,19 @@
is_admin: true
password: ${_param:keystone_sahara_password}
email: ${_param:admin_email}
- service:
- swift:
- type: data-processing
- description: Sahara Data Processing
- endpoints:
- - region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
- public_protocol: ${_param:cluster_public_protocol}
- public_port: 8386
- public_path: '/v1.1/%(tenant_id)s'
- internal_address: ${_param:sahara_service_host}
- internal_port: 8386
- internal_path: '/v1.1/%(tenant_id)s'
- admin_address: ${_param:sahara_service_host}
- admin_port: 8386
- admin_path: '/v1.1/%(tenant_id)s'
+ service:
+ swift:
+ type: data-processing
+ description: Sahara Data Processing
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:cluster_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 8386
+ public_path: '/v1.1/%(tenant_id)s'
+ internal_address: ${_param:sahara_service_host}
+ internal_port: 8386
+ internal_path: '/v1.1/%(tenant_id)s'
+ admin_address: ${_param:sahara_service_host}
+ admin_port: 8386
+ admin_path: '/v1.1/%(tenant_id)s'
diff --git a/keystone/client/service/swift-s3.yml b/keystone/client/service/swift-s3.yml
index 6850dbd..b909ceb 100644
--- a/keystone/client/service/swift-s3.yml
+++ b/keystone/client/service/swift-s3.yml
@@ -12,20 +12,20 @@
is_admin: true
password: ${_param:keystone_swift_password}
email: ${_param:admin_email}
- service:
- swift-s3:
- type: object-store
- description: S3 Service (swift)
- region: ${_param:keystone_region}
- endpoints:
- - region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
- public_protocol: ${_param:cluster_public_protocol}
- public_port: 8080
- public_path: '/v1/AUTH_%(tenant_id)s'
- internal_address: ${_param:swift_service_host}
- internal_port: 8080
- internal_path: '/v1/AUTH_%(tenant_id)s'
- admin_address: ${_param:swift_service_host}
- admin_port: 8080
- admin_path: '/'
+ service:
+ swift-s3:
+ type: object-store
+ description: S3 Service (swift)
+ region: ${_param:keystone_region}
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:cluster_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 8080
+ public_path: '/v1/AUTH_%(tenant_id)s'
+ internal_address: ${_param:swift_service_host}
+ internal_port: 8080
+ internal_path: '/v1/AUTH_%(tenant_id)s'
+ admin_address: ${_param:swift_service_host}
+ admin_port: 8080
+ admin_path: '/'
diff --git a/keystone/client/service/swift.yml b/keystone/client/service/swift.yml
index 94636a4..0fcb555 100644
--- a/keystone/client/service/swift.yml
+++ b/keystone/client/service/swift.yml
@@ -12,19 +12,19 @@
is_admin: true
password: ${_param:keystone_swift_password}
email: ${_param:admin_email}
- service:
- swift:
- type: object-store
- description: Swift Service
- endpoints:
- - region: ${_param:openstack_region}
- public_address: ${_param:cluster_public_host}
- public_protocol: ${_param:cluster_public_protocol}
- public_port: 8080
- public_path: '/v1/AUTH_%(tenant_id)s'
- internal_address: ${_param:swift_service_host}
- internal_port: 8080
- internal_path: '/v1/AUTH_%(tenant_id)s'
- admin_address: ${_param:swift_service_host}
- admin_port: 8080
- admin_path: '/'
+ service:
+ swift:
+ type: object-store
+ description: Swift Service
+ endpoints:
+ - region: ${_param:openstack_region}
+ public_address: ${_param:cluster_public_host}
+ public_protocol: ${_param:cluster_public_protocol}
+ public_port: 8080
+ public_path: '/v1/AUTH_%(tenant_id)s'
+ internal_address: ${_param:swift_service_host}
+ internal_port: 8080
+ internal_path: '/v1/AUTH_%(tenant_id)s'
+ admin_address: ${_param:swift_service_host}
+ admin_port: 8080
+ admin_path: '/'
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index 861ff5c..9f26821 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -1,46 +1,45 @@
parameters:
_param:
- mcp_repo_version: 1.0
apt_mk_version: stable
linux:
system:
repo:
mirantis_openstack:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version} main"
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main"
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ 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}'
priority: 1100
package: '*'
mirantis_openstack_hotfix:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-hotfix main"
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-hotfix main"
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ 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}-hotfix'
priority: 1100
package: '*'
mirantis_openstack_security:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-security main"
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-security main"
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ 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}-security'
priority: 1100
package: '*'
mirantis_openstack_updates:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-updates main"
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-updates main"
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ 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}-uptades'
priority: 1100
package: '*'
mirantis_openstack_holdback:
- source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-holdback main"
+ source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-holdback main"
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
+ 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}-holdback'
priority: 1100
diff --git a/linux/system/repo_local/glusterfs.yml b/linux/system/repo_local/glusterfs.yml
index c34a6f2..cb298c4 100644
--- a/linux/system/repo_local/glusterfs.yml
+++ b/linux/system/repo_local/glusterfs.yml
@@ -6,6 +6,6 @@
repo:
glusterfs:
refresh_db: ${_param:linux_repo_refresh_db}
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} main"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} glusterfs"
architectures: amd64
- key_url: "http://${_param:local_repo_url}/public.gpg"
\ No newline at end of file
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/mcp/extra.yml b/linux/system/repo_local/mcp/extra.yml
index 67d85a5..a0c54d6 100644
--- a/linux/system/repo_local/mcp/extra.yml
+++ b/linux/system/repo_local/mcp/extra.yml
@@ -5,8 +5,7 @@
system:
repo:
mcp_extra:
- default: true
refresh_db: ${_param:linux_repo_refresh_db}
source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} extra"
architectures: amd64
- key_url: "http://${_param:local_repo_url}/public.gpg"
\ No newline at end of file
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
index b51f732..5919a91 100644
--- a/prometheus/server/target/dns.yml
+++ b/prometheus/server/target/dns.yml
@@ -5,11 +5,11 @@
dns:
- name: 'pushgateway'
domain:
- - 'tasks.prometheus_pushgateway'
+ - 'tasks.monitoring_pushgateway'
type: A
port: 9091
- name: 'prometheus'
domain:
- - 'tasks.prometheus_server'
+ - 'tasks.monitoring_server'
type: A
port: 9090
diff --git a/reclass/storage/system/rsyslog_single.yml b/reclass/storage/system/rsyslog_single.yml
new file mode 100644
index 0000000..a3eefac
--- /dev/null
+++ b/reclass/storage/system/rsyslog_single.yml
@@ -0,0 +1,15 @@
+parameters:
+ _param:
+ rsyslog_node01_hostname: rsl01
+ reclass:
+ storage:
+ node:
+ rsyslog_node01:
+ name: ${_param:rsyslog_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.infra.rsyslog
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:rsyslog_node01_address}
diff --git a/salt/control/cluster/rsyslog_single.yml b/salt/control/cluster/rsyslog_single.yml
new file mode 100644
index 0000000..4e53747
--- /dev/null
+++ b/salt/control/cluster/rsyslog_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ control:
+ size:
+ infra.rsyslog:
+ cpu: 8
+ ram: 8192
+ disk_profile: xxlarge
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ rsl01:
+ provider: kvm02.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: infra.rsyslog
diff --git a/salt/master/formula/git/oss.yml b/salt/master/formula/git/oss.yml
index 3c555ee..5c9577a 100644
--- a/salt/master/formula/git/oss.yml
+++ b/salt/master/formula/git/oss.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- salt_master_oss_repository: https://gerrit.mcp.mirantis.net/oss
+ salt_master_oss_repository: https://gerrit.mcp.mirantis.net/salt-formulas
salt_master_oss_revision: master
salt:
master:
@@ -12,5 +12,5 @@
devops_utils.py:
enabled: true
source: git
- address: '${_param:salt_master_oss_repository}/salt-formula-devops-portal.git'
+ address: '${_param:salt_master_oss_repository}/devops-portal.git'
revision: ${_param:salt_master_oss_revision}