Merge "Define compute_node_address option in contrail-vrouter-agent.conf"
diff --git a/README.rst b/README.rst
index 49c542f..b936776 100644
--- a/README.rst
+++ b/README.rst
@@ -1481,37 +1481,3 @@
Trace XMPP requests
http://<compute-node>:8085/Snh_SandeshTraceRequest?x=XmppMessageTrace
-
-
-Documentation and Bugs
-======================
-
-To learn how to install and update salt-formulas, consult the documentation
-available online at:
-
- http://salt-formulas.readthedocs.io/
-
-In the unfortunate event that bugs are discovered, they should be reported to
-the appropriate issue tracker. Use Github issue tracker for specific salt
-formula:
-
- https://github.com/salt-formulas/salt-formula-opencontrail/issues
-
-For feature requests, bug reports or blueprints affecting entire ecosystem,
-use Launchpad salt-formulas project:
-
- https://launchpad.net/salt-formulas
-
-You can also join salt-formulas-users team and subscribe to mailing list:
-
- https://launchpad.net/~salt-formulas-users
-
-Developers wishing to work on the salt-formulas projects should always base
-their work on master branch and submit pull request against specific formula.
-
- https://github.com/salt-formulas/salt-formula-opencontrail
-
-Any questions or feedback is always welcome so feel free to join our IRC
-channel:
-
- #salt-formulas @ irc.freenode.net
diff --git a/debian/control b/debian/control
index a7de37b..f206b81 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
Source: salt-formula-opencontrail
-Maintainer: Jakub Pavlik <jakub.pavlik@tcpcloud.eu>
+Maintainer: Mirantis Dev <dev@mirantis.com>
Section: admin
Priority: optional
Build-Depends: salt-master, python, python-yaml, debhelper (>= 9),
salt-formula-linux, salt-formula-prometheus
Standards-Version: 3.9.6
-Homepage: https://wiki.openstack.org/wiki/OpenStackSalt
+Homepage: https://www.mirantis.com
Vcs-Browser: https://github.com/openstack/salt-formula-opencontrail
Vcs-Git: https://github.com/openstack/salt-formula-opencontrail.git
diff --git a/debian/copyright b/debian/copyright
index cc96f85..7656ff2 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-opencontrail
-Upstream-Contact: Jakub Pavlik <jakub.pavlik@tcpcloud.eu>
+Upstream-Contact: Mirantis Dev <dev@mirantis.com>
Source: https://github.com/openstack/salt-formula-opencontrail
Files: *
-Copyright: 2014-2016 tcp cloud
+Copyright: 2014-2019 Mirantis Inc. et al
License: Apache-2.0
- Copyright (C) 2014-2016 tcp cloud
+ 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 ba3b2d8..a20923f 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -3,6 +3,6 @@
source: "https://github.com/openstack/salt-formula-opencontrail"
dependencies:
- name: linux
- source: "https://github.com/salt-formulas/salt-formula-linux"
+ source: "https://gerrit.mcp.mirantis.com/salt-formulas/linux"
- name: prometheus
- source: "https://github.com/salt-formulas/salt-formula-prometheus"
+ source: "https://gerrit.mcp.mirantis.com/salt-formulas/prometheus"