Add extra bionic repo

Change-Id: I06577fa93e895a7c5940dac41b4f9c24b455f455
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/.gitmodules b/.gitmodules
index b7437e5..dbad89f 100644 (file)
--- 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 268f09a..4bf8ab3 100644 (file)
--- 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 eb80d78..504ee08 100644 (file)
--- 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 (submodule)
index 0000000..a4d0ca5
--- /dev/null
+++ b/mcp/salt-formulas/salt-formula-rabbitmq
@@ -0,0 +1 @@
+Subproject commit a4d0ca57eec99edd1a6df031a6bd8eabec9a7bdd