summaryrefslogtreecommitdiffstats
path: root/mcp
AgeCommit message (Collapse)AuthorFilesLines
2017-12-14patches: Drop salt ver sync patch, now upstreamAlexandru Avadanii2-35/+0
Upstream pull request [1] was merged, drop out patch. [1] https://github.com/salt-formulas/salt-formula-salt/pull/64 Change-Id: I7aac66349a4bec718f7821b75dbad711cd6acd58 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 8fbafdf8a665fb8fff4d6f9f14c343e109c122ec)
2017-12-13[ovs/dpdk] Split out networking restart actionMichael Polenchuk3-1/+13
In common openstack_ha state the networking service restart has no expected effect, so split it out into the detached post-deployment state. Change-Id: Iaaae0cd048474667895b7abf2a77196ee3dee14b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-12-12Revert "[baremetal] Migrate public bridge to ovs"Michael Polenchuk1-25/+10
Vlan tagging on ovs+linux ports doesn't work as expected. This reverts commit c3316c713c936b154b979aa985a400f4b791c0cb. Change-Id: I339cd741c83781e4a946bfde40f7f2551bb9cf02 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-12-12pod_config: cleanup: Drop infra_compute_*_addressMichael Polenchuk3-6/+0
Our PDF installer adapter defines 3 unused reclass params that are misleading, so drop them (infra_compute_node{01,02,03}_address). Change-Id: I0ca49b73add543c8f03b14ed4d805ce55f973bb5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit e48d4876833270b9139ca8196eef2c13f44effcc)
2017-12-11patches: pharos: Bump & drop upstream patchesAlexandru Avadanii3-97/+0
All our staged patches for Pharos repo are now upstream, so bump the git submodule and remove the patch files. Change-Id: I0d68eb3bdd9abfa286c3640acc1f13ce6100801d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 33d945e3045f68ea7cbd2f1b8d01618cb3fed23c)
2017-12-11Merge "[baremetal] Migrate public bridge to ovs" into stable/euphratesMichael Polenchuk2-10/+25
2017-12-11Merge "submodule: pharos: Bump to fix run without eyaml" into stable/euphratesMichael Polenchuk1-0/+0
2017-12-11submodule: pharos: Bump to fix run without eyamlAlexandru Avadanii1-0/+0
Most Fuel PODs do not use encrypted PDFs, so bump Pharos git submodule to include updated `generate_config.py` to silently skip decryption in case eyaml is not installed. Change-Id: I845a32c7001123a93e38197e0daf53d18c797aed Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 8c15c3675d57bfaed9c6923ed8adfdb6879fea49)
2017-12-11[baremetal] Migrate public bridge to ovsMichael Polenchuk2-10/+25
Get rid of "ovs-to-linux" links, instead of this setup native ovs bridge for public interface and link it with neutron external bridge. Change-Id: I483881e78f22fc035107a622307d95761c4a5667 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit bcba227e4947bf1e6976b2a743b87c28ae9645c9)
2017-12-11states: maas: Stop using maas-stable PPAAlexandru Avadanii1-2/+0
Currently, Xenial repos provide MaaS 2.2.x, while the PPA bumped it to 2.3.x. Since we switched to 2.3, we observed a rare wrongful state transition from 'Deploying' back to 'Ready'. Drop the PPA, falling back to 2.2 from mainline distro repos. JIRA: FUEL-312 Change-Id: I3daa118059f37cbeca076da685661c28f3a28a97 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 9da33bc85d681950a09452f28ca39df2108b0b56)
2017-12-11Merge "[baremetal] PDF: Use net_admin for MaaS PXE net" into stable/euphratesMichael Polenchuk2-2/+2
2017-12-09[baremetal] PDF: Use net_admin for MaaS PXE netAlexandru Avadanii2-2/+2
While at it, fix another small issue where a variable (parameters__param_opnfv_maas_pxe_address) was used without being populated (defined in 'runtime.yml', which is not read using `parse_yaml`, like the scenario yml or the PDF expanded class, pod_config.yml). JIRA: FUEL-313 Change-Id: Iee88601d5420f55572bf90c8cf330afbedfb2e21 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 9136aef95f77a1f26175929caedfe6ae662bbbd8)
2017-12-08patches: pharos: Drop patches merged upstreamAlexandru Avadanii8-184/+5
Also, remove redundant pharos patch that adds prx mgmt IPs: - "Re-assign mgmt network to proxy nodes" as those values are set already (to different values!) by patch: + "extend public gateway support" While at it, `make patches-export` should clean the patch dir first. Change-Id: Ice106e5d48c7b4cd90ffc6af7441199034d4f546 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit fbea9fae7a16f1375f7413ccd46146b015fc87ff)
2017-12-07lib.sh: persistent cfg01, mas01 mcpcontrolAlexandru Avadanii1-2/+2
cfg01, mas01 DHCP leases in mcpcontrol virtual network should be persistent (if cfg01 IP changes, minions can't find Salt Master). Change-Id: I497207ebe1537af94fd92de12491664d17ad3144 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit a1c323835f808e6d729c645c8df75a43e51851fe)
2017-12-06Clean up noifupdown support patchMichael Polenchuk2-34/+0
The patch has been merged to upstream linux formula. Change-Id: I09f96be920c5c3ecd09fd2ab132e25519902239b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit a6bc08b2be51b069b629d357a44cfa5979f09c2a)
2017-12-04[baremetal] Restart gateway networking serviceMichael Polenchuk2-0/+1
Make sure all missing interfaces/links are up & running (e.g. br-ex <-> float-to-ex <-> br-floating). Fix (for https://github.com/saltstack/salt/issues/40262) into linux formula brought in a weird behaviour with network/interfaces.u/ items. Change-Id: Ic13f0ed2063455ae191bbc99920f97c5ecaa61fd Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-11-29[baremetal] Fix prx stale route via MaaS DHCPAlexandru Avadanii1-0/+3
Although we add default routes via public network and disable DHCP client from setting new routes, until we reboot the prx* nodes we still have the stale route originally set at initial boot. Change-Id: Ib8e5fb67c7da00684e0ac21984fc4661d3820d83 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7daf7f128714021711970557129a23a86cce2a72)
2017-11-28Revert "[baremetal] Fix maas_subnets without maas_fabrics"Michael Polenchuk2-32/+0
The upstream commit has been merged https://github.com/salt-formulas/salt-formula-maas/commit/0c622327 This reverts commit 2c48915a1a77aa3ac0133155fd0cdadbf280493d. Change-Id: Iff86f3dc171371903e3294eed43977eb6197a5e7 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 2ecb98f7e7c67984fd66e2d6b17d5c05c058490b)
2017-11-28Merge "Align options of glusterfs nova_instances volume" into stable/euphratesMichael Polenchuk2-3/+4
2017-11-27[baremetal] VCP VM base img: Switch URL to AWS S3Alexandru Avadanii1-1/+1
Mirantis prebuilt base image for VCP VMs (used by salt.control on x86_64) has been moved to a new location on AWS S3. Change-Id: I9f4a858a1033c3c0a05cba0bd40a8ceac6075615 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 255742b98efd4ff499a6abc6eb491059fc268d43)
2017-11-27Merge "[baremetal] Retry cinder.controller on failure" into stable/euphratesAlexandru Avadanii1-1/+1
2017-11-27[baremetal] Retry cinder.controller on failureAlexandru Avadanii1-1/+1
Occasionally, cinderng.volume_type_present errors with: ClientException: Service Unavailable (HTTP 503) Instead of retrying the whole state file, use `wait_for` macro to retry only this high state up to 5 times. Change-Id: Ib9ef017aca737e53c853007c13107d56d856c016 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 92fb2b5e303b5e097a21d43612d5c8132f23152b)
2017-11-27[baremetal] MaaS: Fix adding mcp.rsa.pubAlexandru Avadanii1-3/+6
Upstream salt-formula-maas change [1] gated applying "maas_sshprefs" low state by `region.sshprefs` being declared in reclass, which is not true for our model. Mend our region.sls patch to pass mcp.rsa.pub to MaaS unconditionally. This fixes baremetal SSH login with mcp.rsa. While at it, fix duplicate SSH key upload on MaaS state retry. JIRA: FUEL-281 [1] https://github.com/salt-formulas/salt-formula-maas/commit/ec61dd6 Change-Id: I93941a689058f9f48f34861898fbe3ee6ce4e2b4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 9a96a6292f82411a00faf373ca180cb32c26061c)
2017-11-27Align options of glusterfs nova_instances volumeMichael Polenchuk2-3/+4
Change-Id: If0558afd37f16678290353fa9c5e6c4163f814a0 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 74a5bd6ae60916c664b0ec902418e3fae234b0c1)
2017-11-27Revert "Apply apache state on proxy nodes"Alexandru Avadanii2-9/+0
Upstream fixed the salt-formula-horizon in commit 95387ec, by defining 8078 (and only that) port in Apache's ports.conf. This fixes the port 80 overlap, so running the `apache` high state after the `horizon` high state not only is unnecessary now, but also would lead to new breakage, since `apache` state would overwrite the ports.conf (removing 8078 and adding 80), i.e. creating a new port conflict and breaking Horizon port completely. This reverts commit eb4645206d6d74992fca3b8726ee2eebca97205f. Conflicts: mcp/config/states/openstack_ha mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Change-Id: Iea8f0bd90ee8d12f399aad16247dda274d6a907a (cherry picked from commit 0c71112ec06bd73a3ddc42ba0aacd666e9a00553)
2017-11-25Bring in newer glusterfs for mtime unsplit brainAlexandru Avadanii3-0/+6
Recent commit 8ba3a1a (Switch nofeature-ha compute nodes to UCA repo) bumped the reclass/system submodule and brought in upstream commit 2ee306b (Glusterfs: use automatic mtime-based split-brain resolution) which requires support for "cluster.favorite-child-policy", not available in Glusterfs 3.7.x available in Ubuntu Xenial. NOTE: UCA does not provide glusterfs for "Ocata", only for "Pike"+. Instead of reverting the commit switching to mtime brain un-split, bump glusterfs to a version that is not EOL (3.10) using their official PPA. Change-Id: I4606dda2f3d4b7563eea793cc8e5d1380f336f24 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 8a867449217151f59766a74c6165ffc26c7f50b4)
2017-11-25Merge "salt.sh: Rework `git -C` for older git compat" into stable/euphratesAlexandru Avadanii1-1/+1
2017-11-24Merge "Switch nofeature-ha compute nodes to UCA repo" into stable/euphratesAlexandru Avadanii8-7/+36
2017-11-24salt.sh: Rework `git -C` for older git compatAlexandru Avadanii1-1/+1
CentOS 7.4 provides git 1.8.3, while `git -C` support was introduced in 1.8.5, so rework <salt.sh> to not rely on this parameter. Change-Id: Ied88466b2b3d91a3317922fa08f60afe934358a0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 0adbe359a0e448e0a8007b0041890e33a612a4dc)
2017-11-24Merge "ci/deploy.sh: Add new `-E` arg for env erase" into stable/euphratesAlexandru Avadanii4-13/+66
2017-11-24Switch nofeature-ha compute nodes to UCA repoMichael Polenchuk8-7/+36
Employ UCA repo on computes nodes for nosdn-nofeature-ha scenario as well to prevent a regression (creation of ports failed for 1+n instances) of neutron ovs agent from mcp/openstack repos. Change-Id: Ie65ae122096c0d3a93c09d46191787a934bd7d4f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 8ba3a1a4ed0ce41a76fa6d712778904bb56b60ac)
2017-11-23[baremetal] Fix maas_subnets without maas_fabricsAlexandru Avadanii2-0/+32
Change-Id: I603b39d46d3f2f2448b8f9746ad0745e416bbee7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 2c48915a1a77aa3ac0133155fd0cdadbf280493d)
2017-11-23Merge "[virtual] Apply nova controller state twice" into stable/euphratesMichael Polenchuk1-0/+4
2017-11-22ci/deploy.sh: Add new `-E` arg for env eraseAlexandru Avadanii4-13/+66
NOTE: In order to undefine VCP VMs with NVRAM (e.g. AArch64 VMs using AAVMF), an additional parameter should be passed to libvirt by Salt virt core module (equivalent to `virsh undefine --nvram`). While at it, pass CI_DEBUG, ERASE_ENV enviroment variables to state execution, and stop force-applying patches. Also refactor the rsync between foundation node and Salt master, so the whole git repo is copied as </root/opnfv>, and <root/fuel> becomes a link to it; useful for Armband, where 'fuel' is a git submodule. Fix .git paths after rsync, so git submodules work as expected in cfg01 repos. JIRA: FUEL-307 Change-Id: Ic62f03e786581c019168c50ccc50107238021d7f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 77942178b3aff6adc83b5f83645acfff467fa76a)
2017-11-22Merge "[baremetal] public gateway setup on prx nodes" into stable/euphratesAlexandru Avadanii18-114/+110
2017-11-22[virtual] Apply nova controller state twiceMichael Polenchuk1-0/+4
In order to complete broken database sync run nova state on controller one more time. Change-Id: I761f26667ebb531b848a62e096f3d79f588d9f24 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 246928006daf99de2317dc8d171c2b0735a3c605)
2017-11-21[baremetal] public gateway setup on prx nodesGuillermo Herrero18-114/+110
- prx: add route for public traffic to public interface - prx: add route towards salt master through maas - remove dashboard class from proxy node (already implements horizon) - remove dashboard (and benchmark) class definitions (no longer used) - (temporary) backport Pharos change for adapter template JIRA: FUEL-305 Change-Id: Ia14a18ac0123c1134d8d99dc43da9a1f770001d0 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 07f4e0238646fcb77072769feb8a0b68df52caca)
2017-11-20patches: linux.storage.lvm: Disable filterAlexandru Avadanii2-0/+36
JIRA: FUEL-304 Change-Id: I52ae89f933f976b678b27f79e2ad67c3699ef8ec Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d7927a5e63e5314c2a81970150b849b0b9d0bd49)
2017-11-17[baremetal] MaaS: Remove curtin netconfig via SaltAlexandru Avadanii3-2/+7
JIRA: FUEL-301 Change-Id: Id6b2b423b8045c581fa5c02133cf91702d9915c9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 4010ea45c703d82e2fb95dcc869ff72bbca088b7)
2017-11-17Merge "[baremetal] Retry keystone.client state on failure" into stable/euphratesAlexandru Avadanii1-1/+1
2017-11-17Merge "[baremetal] Re-assign mgmt network to proxy nodes" into stable/euphratesAlexandru Avadanii11-12/+68
2017-11-17Merge "Update opendaylight/neutron patch" into stable/euphratesMichael Polenchuk4-124/+42
2017-11-16Merge "[baremetal] SaltStack Deployment Documentation" into stable/euphratesAlexandru Avadanii1-1/+1
2017-11-16[baremetal] Re-assign mgmt network to proxy nodesAlexandru Avadanii11-12/+68
- extend arch-specific list of predefined VM iface names (2 -> 3); - add extra vnet iface for prx0* VCP VMs, connected to br-ctl (mgmt); - add mgmt address to pod_config.yml template (and sample); - add mgmt address to reclass.storage prx nodes; JIRA: FUEL-302 Change-Id: I17ce65eade7f69219fc27264363364e3c47d8f3f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 35041f05e790f8c13782eb4956b991a97fdec853)
2017-11-16[baremetal] Retry keystone.client state on failureAlexandru Avadanii1-1/+1
JIRA: FUEL-306 Change-Id: I648545890c1f7dc59176beac1a0593aed54079cb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Delia Popescu <delia.popescu@enea.com> (cherry picked from commit dcbc90f89292bf5070e8e0b54a760755b8206346)
2017-11-16Update opendaylight/neutron patchMichael Polenchuk4-124/+42
Align opendaylight support patch with latest neutron formula. Employ native ML2 backend/engine option as is instead of bringing in the "opendaylight" keyword into reclass model. Unfreeze the maas & neutron formulas versions. Change-Id: I2807dcf9f83b01d453bca6453524f840c378972f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 1a8153f6391bdde1bab21f7831841f5b6070832d)
2017-11-15Enable neutron trunk portsMichael Polenchuk5-0/+11
The network trunk service allows multiple networks to be connected to an instance using a single virtual NIC. JIRA: FUEL-303 Change-Id: Id9e7c122bc1a32a59f18167e332ceaaa3897b5ef Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 66e745c73ac2aba1ef93ba90db4b167e49813863)
2017-11-15[baremetal] SaltStack Deployment DocumentationAlexandru Avadanii1-1/+1
Generate documentation automatically using `reclass-doc`. nginx is already configured to serve said documentation on proxy's public VIP on port 8090. Change-Id: If2aef646a0ec44d5cc7e9d425e565e5c0aa581b3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit f3a355d5644a7271d9df0a48febc3a93cceddb8e)
2017-11-12salt formulas: Pin via reclass instead of salt.shAlexandru Avadanii5-16/+19
Previous commit pinned the salt-formula-package by installing a specific version after OPNFV-specific patches were applied by `patch.sh`. To prevent patch bypass, move the pin to reclass model. While at it, also move salt-formula-neutron pinning to reclass to bypass wrong minimum length of 2 for version-pinned formula pkgs. Change-Id: I35c2773c130d79ec919685cd771311d6c11e11a8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 1058c7ee35d64f38d978db2b3f840afca2facdef)
2017-11-12Merge "salt.sh: Pin MaaS formula to last known stable ver" into stable/euphratesAlexandru Avadanii1-0/+3