Updating reference from github to gerrit
- Changing Maintainer to dev@mirantis.com
Related: PROD-25327 (PROD:25327)
Change-Id: I04c6026c0570f6e5941f18e5054475fac1c5a4c5
diff --git a/LICENSE b/LICENSE
index 6f2b42f..327cc68 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 tcp cloud a.s.
+Copyright (c) 2014-2019 Mirantis Inc. et al
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/README.rst b/README.rst
index 2e836bf..5cfa7ae 100644
--- a/README.rst
+++ b/README.rst
@@ -308,7 +308,7 @@
master:
gitfs_remotes:
salt_formula:
- url: https://github.com/salt-formulas/salt-formula-salt.git
+ url: https://gerrit.mcp.mirantis.com/salt-formulas/salt.git
enabled: true
params:
base: master
@@ -932,29 +932,3 @@
* http://salt-cloud.readthedocs.org/en/latest/topics/rackspace.html
* http://salt-cloud.readthedocs.org/en/latest/topics/map.html
* http://docs.saltstack.com/en/latest/topics/tutorials/multimaster.html
-
-Documentation and Bugs
-======================
-
-* http://salt-formulas.readthedocs.io/
- Learn how to install and update salt-formulas
-
-* https://github.com/salt-formulas/salt-formula-salt/issues
- In the unfortunate event that bugs are discovered, report the issue to the
- appropriate issue tracker. Use the Github issue tracker for a specific salt
- formula
-
-* https://launchpad.net/salt-formulas
- For feature requests, bug reports, or blueprints affecting the entire
- ecosystem, use the Launchpad salt-formulas project
-
-* https://launchpad.net/~salt-formulas-users
- Join the salt-formulas-users team and subscribe to mailing list if required
-
-* https://github.com/salt-formulas/salt-formula-salt
- Develop the salt-formulas projects in the master branch and then submit pull
- requests against a specific formula
-
-* #salt-formulas @ irc.freenode.net
- Use this IRC channel in case of any questions or feedback which is always
- welcome
diff --git a/debian/control b/debian/control
index 9f78368..9412c00 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
Source: salt-formula-salt
-Maintainer: Ales Komarek <ales.komarek@tcpcloud.eu>
+Maintainer: Mirantis Dev <dev@mirantis.com>
Section: admin
Priority: optional
Build-Depends: salt-master, python, python-yaml, debhelper (>= 9),
salt-formula-git, salt-formula-reclass
Standards-Version: 3.9.6
-Homepage: http://www.tcpcloud.eu
-Vcs-Browser: https://github.com/tcpcloud/salt-formula-salt
-Vcs-Git: https://github.com/tcpcloud/salt-formula-salt.git
+Homepage: https://www.mirantis.com
+Vcs-Browser: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/salt
+Vcs-Git: https://gerrit.mcp.mirantis.com/salt-formulas/salt.git
Package: salt-formula-salt
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 79abd6c..547ff5f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: salt-formula-salt
-Upstream-Contact: Ales Komarek <ales.komarek@tcpcloud.eu>
-Source: https://github.com/tcpcloud/salt-formula-salt
+Upstream-Contact: Mirantis Dev <dev@mirantis.com>
+Source: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/salt
Files: *
-Copyright: 2014-2015 tcp cloud a.s.
+Copyright: 2014-2019 Mirantis Inc. et al
License: Apache-2.0
- Copyright (C) 2014-2015 tcp cloud a.s.
+ Copyright (C) 2014-2019 Mirantis Inc. et al
.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/metadata.yml b/metadata.yml
index 07d8f6f..952021f 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,8 +1,8 @@
name: "salt"
version: "0.4"
-source: "https://github.com/salt-formulas/salt-formula-salt"
+source: "https://gerrit.mcp.mirantis.com/salt-formulas/salt"
dependencies:
- name: git
- source: "https://github.com/salt-formulas/salt-formula-git"
+ source: "https://gerrit.mcp.mirantis.com/salt-formulas/git"
- name: reclass
- source: "https://github.com/salt-formulas/salt-formula-reclass"
\ No newline at end of file
+ source: "https://gerrit.mcp.mirantis.com/salt-formulas/reclass"
diff --git a/tests/pillar/master_formulas.sls b/tests/pillar/master_formulas.sls
index 0209bb4..ed1c3fe 100644
--- a/tests/pillar/master_formulas.sls
+++ b/tests/pillar/master_formulas.sls
@@ -43,11 +43,11 @@
formula:
aptly:
source: git
- address: 'https://github.com/salt-formulas/salt-formula-aptly.git'
+ address: 'https://gerrit.mcp.mirantis.com/salt-formulas/aptly.git'
revision: master
bind:
source: git
- address: 'https://github.com/salt-formulas/salt-formula-bind.git'
+ address: 'https://gerrit.mcp.mirantis.com/salt-formulas/bind.git'
revision: master
renderer:
jinja:
diff --git a/tests/pillar/master_single_extolddays.sls b/tests/pillar/master_single_extolddays.sls
index 87c3df7..d9a99d2 100644
--- a/tests/pillar/master_single_extolddays.sls
+++ b/tests/pillar/master_single_extolddays.sls
@@ -22,7 +22,7 @@
# formula:
# python:
# source: git
- # address: 'https://github.com/salt-formulas/salt-formula-python.git'
+ # address: 'https://gerrit.mcp.mirantis.com/salt-formulas/python.git'
# revision: master
pillar:
engine: reclass
diff --git a/tests/pillar/master_single_extpillars.sls b/tests/pillar/master_single_extpillars.sls
index d2d2422..b3332f0 100644
--- a/tests/pillar/master_single_extpillars.sls
+++ b/tests/pillar/master_single_extpillars.sls
@@ -23,7 +23,7 @@
# formula:
# python:
# source: git
- # address: 'https://github.com/salt-formulas/salt-formula-python.git'
+ # address: 'https://gerrit.mcp.mirantis.com/salt-formulas/python.git'
# revision: master
pillar:
engine: composite
diff --git a/tests/pillar/master_single_extreclass.sls b/tests/pillar/master_single_extreclass.sls
index 7162dce..197f60c 100644
--- a/tests/pillar/master_single_extreclass.sls
+++ b/tests/pillar/master_single_extreclass.sls
@@ -22,7 +22,7 @@
# formula:
# python:
# source: git
- # address: 'https://github.com/salt-formulas/salt-formula-python.git'
+ # address: 'https://gerrit.mcp.mirantis.com/salt-formulas/python.git'
# revision: master
pillar:
engine: reclass