Age | Commit message (Collapse) | Author | Files | Lines |
|
Parse all reclass j2 templates, not only common + current scenario
(useful when adding new scenarios later).
JIRA: FUEL-310
Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 09dce2a2643223d66aa1ac3a0ad8feebc082f521)
|
|
- reduce range to silence bogus MaaS warning about address exhaustion;
- regenerate pod_config.yml.example to reflect the changes;
- drop `opnfv_infra_maas_pxe_address` (duplicate of
`opnfv_infra_maas_node01_deploy_address`);
- add `opnfv_infra_config_pxe_address` for future usage;
JIRA: FUEL-316
Change-Id: I981fc8c7c550c2917b07dd5f2c83896def013fa7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 215a37d55356333f9fd0a96118c9a00d588eca62)
|
|
- s/opnfv_maas_pxe_/opnfv_infra_maas_pxe_/g to align with other vars;
- patches: pharos: Add MaaS PXE network to installer adapter;
- runtime.yml{,.template}: move to installer adapter, update
pod_config.yml example;
- drop MAAS_PXE_NETWORK global env var, now read strictly from PDF;
JIRA: FUEL-313
Change-Id: I46d7510bd53fba7890c411d36bc28fd6ff6f3648
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 15e982f0d00dbcc72be2f5b25dab34b3f3efd912)
|
|
Ubuntu prefers ipv6 connections therefore in some networks, this
breaks software updates (it does a AAAA DNS lookup before A record
lookups). Let's prefer old style ipv4 connections over the new ipv6 in
order to save some processing and resource utilization.
Based on previous work from [1] (but without /etc/gai.conf, only APT).
[1] https://review.openstack.org/#/c/462502/
JIRA: FUEL-321
Change-Id: Ic3dff3baa1c0be9ac95972557d6a2d26641bfe1b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4d604967adde375eb24ae165aff83c11be89ca30)
|
|
This modification enables having different models of target nodes
but restricts them to two groups of the same kind assuming:
- 3 KVMs will be same model and have the same NIC names
- 2 Compute nodes will be the same model and have same NIC names
This is an ad-hoc change for arm-pod7. Will work for all other setups
but the jinja2 logic should be evetually extended to support a per
board approach, allowing any board to be any kind
Change-Id: Ie994d661e3dbe5b9a33d290a850a6152cf320c86
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit ee149500e0e6bde0152aa56140046a2d1b995eb4)
|
|
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>
|
|
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)
|
|
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)
|
|
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)
|
|
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>
|
|
|
|
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)
|
|
Change-Id: If0558afd37f16678290353fa9c5e6c4163f814a0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 74a5bd6ae60916c664b0ec902418e3fae234b0c1)
|
|
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)
|
|
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)
|
|
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)
|
|
- 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)
|
|
JIRA: FUEL-301
Change-Id: Id6b2b423b8045c581fa5c02133cf91702d9915c9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4010ea45c703d82e2fb95dcc869ff72bbca088b7)
|
|
|
|
|
|
- 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)
|
|
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)
|
|
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)
|
|
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)
|
|
On low state expansion, apache.server.modules is iterated, and
since reclass transforms '~' into 'null', an exception is thrown.
Use an empty string instead (different type will still ensure reclass
overrides variables from apache service instead of merging the lists).
While at it, add missing version 'latest' for mod-wsgi pkg.
Change-Id: I7913483b6a1be545b96de2958c39840940d9c557
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 40f907255380dbfc4d808d9f3c768db80c4c8158)
|
|
Apache module will take care of ports.conf file to prevent
bind socket conflict between apache & nginx services.
Change-Id: Ia76ec356002e1db0dabd20d8f355a1b16fc07b30
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit eb4645206d6d74992fca3b8726ee2eebca97205f)
|
|
|
|
cloudify vnf requires public enpoints to be available from instance
with manager, so connect nodes w/ nginx to routed public network.
JIRA: FUEL-286
Change-Id: Id0caa699519b9b46dad51deac6955afe6a0050de
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 0861ea0799114d9c59499f2c52a9c7a79fb1bbb7)
|
|
Horizon login fails due to CSRF_COOKIE_SECURE being set when no SSL
is available.
JIRA: FUEL-297
Change-Id: I23f8ee86dbf5a909c75cfcc217a2ab6e4dca7324
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 6436cbad3cdf190d891c0121c7e6a7fd814a1026)
|
|
|
|
Let's add more hugepages/memory to the compute nodes since
snaps_smoke required 2Gb flavor for tests.
Change-Id: If52f30d53a6469abeca67aaf2bdee551542d1653
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 496c818b28b6d668428b3e8996675a7edd688f73)
|
|
This change extends current PDF/IDF support with:
- dynamic interface / vlan definition;
- dynamic interface and/or bridge allocation of installer networks on
top of interfaces (physical or vlans);
This allows us to drop hardcoded interface names and vlan / bridge
configuration in favor of a runtime determined model based on PDF/IDF.
For now, we duplicate common jinja variable definitions in each
template, but this will later be moved to a common include file.
JIRA: FUEL-275
Change-Id: Ia80a66dbdf898b0bd0a4fb99d069ce9ebe33fa65
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit c360b972649028d2613fc8561899c2c8b7f71832)
|
|
JIRA: FUEL-284
Change-Id: I821a8e79e6a23a71eae0fc0f857c1d05b30cd188
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 5936f07b1e951f4f08c0bc20c97122289f544c9e)
|
|
In order to set properly keystone fernet keys, apply glusterfs client
state before second keystone server state. Also leave out user/group
settings for glusterfs volume of nova instances as it will be set later
by nova compute packages themselves.
Change-Id: I069e37c67f08c51ed29f45cf6f92d4a00a1ac97b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 0224929b3a87d0e0ec011311c46872e6142497cf)
|
|
Inheriting classes in the wrong order led to params being silently
overriden by defaults in the system reclass classes, leaving
some mismatched values between the controller nova config and the
compute conunterpart (e.g. metadata_password had different values).
Always inherit the common class first, so scenario-specific config
is applied on top.
NOTE: {dhcp,single}_nic are not used for mas|kvm|cmp nodes, but they
are referenced in inherited classes, so keep them for now.
Change-Id: I6cb90d5c832ffc8ab731bd9e3cd38ede858dba5c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 92530f89c061b0070766e431f839feb368e2e4ac)
|
|
While at it, compact 'set' into bash shebang where possible and
add `make patches-copyright` target to simplify adding patch
license headers.
Change-Id: I0c841de72e5709e5eef915a52c5ec4a7fc0f7c37
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 644e5fdfa2f49b988a5150e2a4eefc12daecd845)
|
|
While at it, add .yamllint file (copied from releng repo).
Change-Id: I39630c0043fe2fd601510969c401e6cc9efbf69a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit a75af3d4c30af050dd15c0f875142f6328874fe4)
|
|
Change-Id: I1e0e1ba291dd4d5af578d89274f3655ee784f64e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit c11eb920a3570ed22b252bbb8eecfb5231f5db1a)
|
|
-Fix interface order for reclass config node
-Interface types regruped on 3 sets for each cpu arch
-Foundation VM interface names
-VCP VM interface names
-Baremetal node interface names
Change-Id: I1ae522d775ee538b35b0f043914c80c3993232fc
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit c8d0c5b687f5eec9db62171fdf53053f5ffeef28)
|
|
Change-Id: If117588f7c43306959d29032b1d5eeb3c751dc44
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 8401f25a520843d884abb84806873baca0452ec8)
|
|
Salt's virtualization model for virt:nic:default does not use real
interface names that are present on the node, but instead it defaults
to using "ethX" notation, that name being only a convention inside
Salt internals.
Moreover, the 'salt.control.virt' reclass class (located in
/srv/salt/reclass/classes/system/salt/control) already provides a
defalt maping between "eth{0,1}" and "br{0,1}". Using anything
different than "eth{0,1}" will lead to 2 extra (broken) mappings.
Reverting the changes in "virt:nic" reclass fixes both the python
exception recently introduced, as well as the broken defaults.
Change-Id: I5c90e3d2bc181c1ad3d87af64440439e6a41fb28
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit db2144a7f6ed8586bbab39fdb5ea15b171388e85)
|
|
Change-Id: I94d40529261f7753ec47a0c6a8c67ecc0fb15951
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit 5ab45d25c8fd3e5528c411e09b105699c745457f)
|
|
* use pseudo agentdb port binding controller instead of
the deprecated network topology one
* disable superfluous l2population mechanism driver
* tidy up the duplicated haproxy neutron listen opts
* straighten karaf features list
* update jetty config
Change-Id: Ifacf8de11eb56ab72df13a312151a510b280dea2
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit fca7d22742df82fc6e502b17ad45ebc11c0ba89b)
|
|
Rally test of NovaServers.boot_server_attach_created_volume_and_live_migrate
requires 10Gb volume to function, so extend volume group size in order to
avoid insufficient free space error.
Change-Id: I317935d2bf736db360061e24f299c9b885154a9e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 2d95dee51177e66f5370b85115c2999925b13657)
|
|
- minor refactor of runtime templates parsing to allow var expansion;
- parse <pod_config.yml> into shell vars, match dynamically networks
from PDF to IP addresses on bridges of current jumphost;
- keep old '-B' parameter in <ci/deploy.sh>, use it for providing
fallback values in case there's no bridge name specified via IDF
and no IP on the jumphost for one or more of the PDF networks;
- re-enable dry-run to ease testing of the above;
- add sample 'idf-pod1.yaml' to <mcp/config/labs/local>;
The new behavior will try to determine the jump host bridge names:
1. Based on IDF mapping, if available
2. Based on PDF network matching with IP addrs on jumphost;
3. Fallback to values passed via '-B';
4. Fallback to default values hardcoded in the deploy script;
Later, we will drop MaaS network env vars in favor of PDF vars,
once the PDF template is generating them.
Change-Id: If9cd65d310c02965b2e2bfa06a0d7e0f97f1dd48
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 8ec927497b7ee0fd3b7346e957878173b080ef6a)
|
|
Change-Id: If7cb8473f5c290d1d5f22fce5567f7b8da24fd9f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 0c00f813d709fd1b65e5dd52abcf16fd81b3d0e1)
|
|
Use default mtu for br-mgmt in order to resolve the live
migration failure (cannot recv data: connection timed out)
Change-Id: I9cee453d87f849e29fc877fff237f8e604f2df53
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit b45f3e15ac5581c1e8c44d0a7a1424a1d092834e)
|
|
|
|
Upstream change [1] made the inclusion of service.maas.cluster.single
mandatory by using some default reclass definitions which we don't
override explicitly.
[1] https://github.com/salt-formulas/salt-formula-maas/commit/
ce118a238bae4bcf19d2f10bca591a40405f7c3c
Change-Id: I5746b6906b341a7257e0cd2b4b0bed8ea25840f4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4b2dfa552656def5f56a48229705e79c5c7bcfca)
|
|
- add new git submodule pointing to OPNFV Pharos;
- use Pharos 'generate_config.sh' to parse the PDF using the Fuel
installer adapter and generate <pod_config.yml> dynamically;
- build <pod_config.yml> outside current git repo and sync separately
to prevent sensitive data leak;
- add <pod1.yaml> PDF sample based on LF-POD2, should be used with
'ci/deploy.sh -l local -p pod1';
Change-Id: I4e1b95f180bcd5ade5d86f516628eb8edbe64b1c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 36e4b9754dedef27637c09b510829f686bd469e4)
|