aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
AgeCommit message (Collapse)AuthorFilesLines
2018-09-26[ovn] Disable metadata agentstable/fraserMichael Polenchuk1-0/+2
OVN metadata agent is unsupported for pike. Change-Id: Id4781df6cdb7100567ac96500f988094c1699698 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-09-17[lib.sh] Stop Fuel@OPNFV containers if presentAlexandru Avadanii1-0/+4
JIRA: FUEL-388 Change-Id: I6a7286bb9fc0243ab4a89292e34059fc85a831c4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-09-06Revert "[Horizon] Drop the obsolete Horizon workaround"Alexandru Avadanii2-0/+22
This reverts commit e6685124258ed9d1237acf9d8b383c07f1397f93. Change-Id: If9ebf7ff149ce0dcf3976e99863e88e5a7ef2c74 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-09-04Merge "Turn off default apache ports" into stable/fraserAlexandru Avadanii7-3/+19
2018-09-04Unmask OpenDaylight service explicitlyMichael Polenchuk1-7/+5
After salt update to version 2017.7.0 the indefinite mask has to be removed before attempting to start the service. Change-Id: I21616929f06f8ebd8a2d70e8c33f92c7b808a9c5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 941a31e1e7f64f38a487b4e493bc25fdf29657da)
2018-09-04Turn off default apache portsMichael Polenchuk7-3/+19
Change-Id: Ie1b427975e7596f6ba0eba953d60b21a907d65c5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 8de9c24300817b9d0ce4f2bfb2ab63643d895a1a)
2018-08-29Update Salt version to 2017.7Alexandru Avadanii4-7/+7
Salt 2016.x has a bug with states ordering coming from 'include' statement. Glance/Heat DB sync is applied before package setup although clearly specified 'require' in state. Change-Id: Icc2769f38567072ffa223f715443930f0c18dd1b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06[patch] Rebase keyserver patch for disabled reposAlexandru Avadanii1-36/+15
Rebase patch on top of upstream commit [1]. [1] https://github.com/salt-formulas/salt-formula-linux/commit/45cf452d Change-Id: Id44eab58150ff69140f630352a299633cdb4f4ac Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit c52837f7d28b7c0f231be2b0215a7035b26ae302)
2018-08-03[patch] Rebase keyserver support for update logicAlexandru Avadanii1-18/+23
Change-Id: Iad2502e876600ba966a38f2df3e71bd579f80e8f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6269b9ffce8c730eba2a4037075484e007c010b8)
2018-07-30Merge "[patch] Rebase keyserver proxy support" into stable/fraserAlexandru Avadanii1-84/+76
2018-07-30[maas] Fix saltstack repo source with archGuillermo Herrero1-1/+1
This change avoids bug upstream when salt formula tries to complete the repo entry with arch qualification Change-Id: I6509bf74bb8f2e69509dfeb63a90434da31e17c2 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-07-30[patch] Rebase keyserver proxy supportMichael Polenchuk1-84/+76
https://github.com/salt-formulas/salt-formula-linux/commit/f27f436 Change-Id: I9662dcff23c363430b6a04808f4e03617a10c160 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 5aca58b8deeec57b22249bb1d386de20ab7c2240)
2018-07-09[patch] MaaS: Switch to upstream fabric/vlan mgmtAlexandru Avadanii3-97/+17
Obsolete our out of tree patch in favor of upstream mechanisms for creating fabrics/VLANs/subnets. Change-Id: I57d6d59764a825b428f423d48c5d90af7f2e676f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 3831d538436cbf7c033b560b76f554a1dfe28a4c)
2018-07-02[salt-formulas] opendaylight: Fix noproxy caseopnfv-6.2.1Alexandru Avadanii1-0/+2
Change-Id: I192cda7412151b2974e1bcd79a51f7593acace5d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit b52c4df4061fd7a51aad94f144bb1326fa8a8b5a)
2018-07-02[salt-formulas] opendaylight: Adjust keyserver prxAlexandru Avadanii1-6/+4
Align opendaylight/server sls with the latest salt-formula-linux version of keyserver requests support behind proxy. Change-Id: I55f9010eec8b74932d4a28215ecf9647deb3d82c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6924fe7e4cadeb5dbe6857adb413d688209bd4e1)
2018-07-02[apt] Allow downgrades during APT operationsAlexandru Avadanii2-0/+4
Pinning certain packages (e.g. OVS) interfers with `dist-upgrade` if downgrades are not explicitly allowed. Change-Id: I0b001936e86228037c30f30812e32d6221ef458d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02[AArch64] Pin armband repo with highest prioAlexandru Avadanii2-1/+15
Mirantis repositories shadow certain packages from Armband repos (e.g. qemu-efi) if pinning is not set. Since MaaS does not allow configuring repo priorities via its API, use Salt pillar data to re-define the Armband repo and set its prio. Change-Id: Ic743f4b684b3f13552792f5f04097fac73171b37 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d6d2348ee690768101ff661c7811c25d9c65c104)
2018-06-29[patch] MaaS: fabric ID from CIDRopnfv-6.2.0Alexandru Avadanii3-3/+88
Change-Id: I1e1490f4d0a0bee2783450c6369d7ab6c45b193f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29sysinfo_print: Dump all iptables rulesAlexandru Avadanii1-0/+1
Change-Id: I0ce6d21e14efe6e5236759c8d8b3439f09e89675 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit fa26dabea271cee86c71b95f7d4650ef53eb2419)
2018-06-27[ha] Add fabric to maas admin subnetMichael Polenchuk3-95/+8
Change-Id: Ida4cf736dfe60886384e7e180d3e43faf811bd58 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 75cbbc689bd9428384f4828f970981da52e92a04)
2018-06-14[patch] Rebase keyserver proxy support (3)Alexandru Avadanii1-21/+8
Rebased on top of [1]. [1] https://github.com/salt-formulas/salt-formula-linux/commit/9f30456 Change-Id: Iad5aef674c47d622a94d1c21cae3f46fbb3c52d8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit fd1f3fa1c8c83b2e5f8cacc6a6caf1a14e40b1a5)
2018-06-13[patch] Rebase keyserver proxy supportAlexandru Avadanii1-30/+42
Rebase on top of [1]. [1] https://github.com/salt-formulas/salt-formula-linux/commit/6f5e69e Change-Id: Ic34bb9c1fad8778262f2e876c91667e903d143bf Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 79e32c8cc5631204d2e5b0b328c954a2a2197037)
2018-06-07[patch] Rebase APT keyserver proxy support patchAlexandru Avadanii3-68/+130
Sync our patch with upstream PR [1]. [1] https://github.com/salt-formulas/salt-formula-linux/pull/138 Change-Id: If3a51d3aef51accee0901c59e1342b42dbe4be4b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 78d368731c9582361cc291d5618e01702982f2b9)
2018-06-06Pin OVN packagesMichael Polenchuk2-2/+2
Make a pinning of OVN packages as well to meet an openvswitch dependency. Change-Id: I96ac7e052c710b65fc1f74bc4f406bba435d433f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-06-05Clean out merged upstream patchMichael Polenchuk2-42/+0
Change-Id: I0c8f87bad0fbe55684bd43547674ed91a31f39f8 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 5ab2540591ad029b5b6cf23eab88959fbd14712b)
2018-06-04Merge "[patch] Drop upstream reclass formula patches" into stable/fraserAlexandru Avadanii5-125/+0
2018-06-04[submodule] Bump Pharos for ericsson-pod1 updatesAlexandru Avadanii1-0/+0
This bump also brings in: - arm-pod{8,9} config; - UNH lab config; - NTP config in IDFs for existing PODs; - basic vPDF support; Change-Id: Ifc16616bc8a13de2bdf048971448d4853e93880e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 4ee7da0aa1128569bc97e5a28ce10a3ce1aac142)
2018-06-04[patch] Drop upstream reclass formula patchesAlexandru Avadanii5-125/+0
Change-Id: Iad2a27d059b43ed14fb70bdee01b3db29613615b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 28ccbe4f37cf8b2e38681d4a732f80112888ce84)
2018-06-04Merge "Pin openvswitch packages from UCA" into stable/fraserAlexandru Avadanii2-0/+8
2018-06-04Merge "[noha] Disable proxy certificate generation" into stable/fraserAlexandru Avadanii1-1/+0
2018-06-03[patch] maas: rebase artifact downloadAlexandru Avadanii1-24/+30
Upstream refactored maas/regions.sls to introduce kitchen tests in [1], rebase our patches on top of it. [1] https://github.com/salt-formulas/salt-formula-maas/commit/8a0d52e Change-Id: I491fb2e05679ebc226a27141e685d429e0ff8bcc Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit e2c554c856a923c4a6323c96a190fd82e3d049d7)
2018-06-01Pin openvswitch packages from UCAMichael Polenchuk2-0/+8
Make a pinning of openvswitch packages to get 2.8.1 version. Change-Id: I2bb78050cebd671ef1dddbac02705e0782fc34c8 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-05-31[noha] Disable proxy certificate generationAlexandru Avadanii1-1/+0
noha scenarios try to generate the proxy SSL cert using the Salt Master CA authority. However, this requires a `salt-minion` restart between the CA configuration and the cert generation (see [1]). Since we don't use this cert anyway, let's just disable it for cfg01. JIRA: FUEL-377 [1] https://github.com/salt-formulas/salt-formula-salt/issues/67 Change-Id: I8e88200e0d5614f0034c0c77e6ba675dc7ef0c11 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 016db55bd5cc07d32926b60d59b1fdd7e2471705)
2018-05-30mcp: salt-formulas: opendaylight: AArch64 leveldbAlexandru Avadanii1-0/+5
ODL requires native leveldbjni support on architectures like AArch64, provided as a Debian package in ODL Team Nitrogen PPA. Only systemd is supported (unlikely to change). JIRA: ARMBAND-387 Change-Id: Ie7f2955c6574ab4584ed0c207b42ed7ab7261561 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 57175f45f6ae9c2ee2adf02ea30a75c0ab956206)
2018-05-25[maas] Download only used subarches imagesopnfv-6.1.0Alexandru Avadanii2-2/+2
- reduce download size/time for MaaS images by downloading only the subarch images we use; - fix stop condition in MaaS artifact download script; - stop importing images before updating the boot resources to prevent race conditions; Change-Id: I3b15fae3463bc6c54be2cc06e0cb31edcbd307cb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7f797f1b5a9340d24d700879abca6b39413e7375)
2018-05-25Merge "maas: boot-resources: Dynamic arch list from PDF" into stable/fraserAlexandru Avadanii3-3/+5
2018-05-25Merge "[maas] Adopt maas.machines.storage" into stable/fraserAlexandru Avadanii3-30/+9
2018-05-25Merge "AArch64: Switch back to hwe-16.04 kernel" into stable/fraserAlexandru Avadanii2-2/+9
2018-05-24[Horizon] Drop the obsolete Horizon workaroundting wu2-22/+0
Since we switch the Horizon package from Ubuntu/UCA repo to MCP repos, we can drop the obsolete Horizon workaround. JIRA: FUEL-374 Change-Id: I0b77a4f2158a972a5eb400919f2929c7bd8360cf Signed-off-by: ting wu <ting.wu@enea.com> (cherry picked from commit 63b712d1d2052e9dd762a20184913d6394f45ea9)
2018-05-24AArch64: Switch back to hwe-16.04 kernelAlexandru Avadanii2-2/+9
Align kernel versions across architectures (where possible). Change-Id: I66a822611eb5e46f90b62f5d36df571ae75dcba3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 931141e84500695b4a278cc04888b603749a8303)
2018-05-24[maas] Adopt maas.machines.storageting wu3-30/+9
Replace MAAS CLI set_disk_layout with the new maas.machines.storage state JIRA: FUEL-364 Change-Id: I4d8cd9f473c5386ee7b32ad378ca1e02989233ca Signed-off-by: ting wu <ting.wu@enea.com> (cherry picked from commit 96019123adad087bc0d744a6785ceebb7b21476d)
2018-05-24maas: boot-resources: Dynamic arch list from PDFAlexandru Avadanii3-3/+5
Instead of leaving MaaS default to 'amd64', explicitly set the list of architectures to support based on PDF data. Change-Id: I852a3ce156db3df0c090f10c0b45c26058dbb6c6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit be45e3157fe19b8905e3a30f7f839a728a6c6df7)
2018-05-23Revert "[patch] Backport proposed generate_dhparams fix"Michael Polenchuk2-42/+0
This reverts commit c7dff6e1ae6444f60d3fe20b1f495609c7980051. The patch has been merged into upstream. Change-Id: Idf768b9b94b3498994601d50feeeef008430ba27 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 7b358ba97fce7925ea6504977ae1c600e3123e3c)
2018-05-22Merge "[xdf] Fix parsing of non-range private vlan(s)" into stable/fraserAlexandru Avadanii4-3/+5
2018-05-22[patch] Backport proposed generate_dhparams fixAlexandru Avadanii2-0/+42
Upstream PR [1] should fix recently introduced issues with nginx state for SSL-enabled sites. [1] https://github.com/salt-formulas/salt-formula-nginx/pull/40 Change-Id: I52b5e4f51539e535249e0850f0b34c2801f4d74a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit c7dff6e1ae6444f60d3fe20b1f495609c7980051)
2018-05-22[maas] AArch64: Preseed Armband repositoriesAlexandru Avadanii4-80/+52
Preseed Armband common repo-comp for Pike, so we get the updated kernel & other packages from the start. Requires upstream PR [1]. While at it, also handle related PR merged upstream [2] by explicitly setting maas.region.subnets name via j2 instead of reclass param expansion in name (allows us to drop the remaining chunk of the fabric-from-CIDR patch we used to carry). Note: opnfv_infra_maas_pxe_network_addres can now be dropped from pod_config j2 template in Pharos Fuel installer adapter. [1] https://github.com/salt-formulas/salt-formula-maas/pull/26 [2] https://github.com/salt-formulas/salt-formula-maas/pull/22 Change-Id: I356adb73b80f0f2d85db4ab060e804cb9a053862 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 52af46f2cac395e893007029d24d5365e27a4328)
2018-05-22[xdf] Fix parsing of non-range private vlan(s)Alexandru Avadanii4-3/+5
Private (tenant) vlan range support introduced a regression in parsing PDF/IDF with a single vlan (no range) due to the value being interpreted as an int instead of string. Change-Id: Id5d67c4c516a9bb807ffa5e111ead5cbcee7e2ca Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 0bc600fd4d269a17ebcf28700b46e199d66c25db)
2018-05-22Define mongodb admin credentialsMichael Polenchuk2-0/+6
They aren't used by mongodb formula anymore but still required by salt minion state. Change-Id: I3168e7934df38c34c5d6889f4332dc1be0415bd7 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-05-15AArch64: Switch to upstream Saltstack repoAlexandru Avadanii1-1/+3
To work around the missing dependency of 'python-tornado' on 'python-features' provided by the binary-specific DEB package in amd64 Saltstack repository, pre-install the req explicitly on FN (jumpserver) and VCP VMs via lib.sh. JIRA: ARMBAND-382 Change-Id: I2dbd08a58f6cf57c2c48c2d7fc8d19ad4872e800 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit f15d0275832e59c4e2ac16fa9c066b5771b26dfb)
2018-05-04[odl] Remove unused connecter/port from proxyMichael Polenchuk2-23/+0
Change-Id: I7a880c0a011d6f5f4a7e2d8c8309871b1c290235 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit d97b19bdde59600f588b1e6aca52a6d1962f8778)