aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-07-12 06:08:53 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-07-12 06:08:53 +0000
commit2ed3a56ae4865514ba099773616df96865a0ca32 (patch)
tree07a41a3c3ee3a38fe5e7c68d3a0541d5ae39aba1
parentc950e71d004ee8871c01af564ffac5347416dd10 (diff)
parent5bf8351becb481c266e7f0f9629064667de414be (diff)
Merge "Add extra bionic repo"
-rw-r--r--.gitmodules4
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml9
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j24
m---------mcp/salt-formulas/salt-formula-rabbitmq0
4 files changed, 17 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index b7437e574..dbad89fc8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -86,3 +86,7 @@
path = mcp/salt-formulas/salt-formula-glance
url = https://gerrit.mcp.mirantis.com/salt-formulas/glance
branch = master
+[submodule "salt-formula-rabbitmq"]
+ path = mcp/salt-formulas/salt-formula-rabbitmq
+ url = https://gerrit.mcp.mirantis.com/salt-formulas/rabbitmq
+ branch = master
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
index 268f09ae6..4bf8ab3fb 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml
@@ -27,7 +27,16 @@ parameters:
pin: 'release o=Mirantis'
priority: 1101
package: '/jinja2|redis/'
+ 15:
+ enabled: true
+ pin: 'release o=Mirantis,l=extra-nightly'
+ priority: -1
+ package: 'mysql-common'
20:
enabled: true
pin: 'release o=Mirantis'
priority: 1
+ mirantis_extra:
+ # yamllint disable-line rule:line-length
+ source: "deb ${_param:linux_system_repo_url}extra/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mirror_mirantis_key}
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index eb80d7831..504ee087e 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -238,3 +238,7 @@ parameters:
crypto_plugin: simple_crypto
store_plugin: store_crypto
global_default: true
+ rabbitmq:
+ server:
+ env_variables:
+ hostname: localhost
diff --git a/mcp/salt-formulas/salt-formula-rabbitmq b/mcp/salt-formulas/salt-formula-rabbitmq
new file mode 160000
+Subproject a4d0ca57eec99edd1a6df031a6bd8eabec9a7bd