| 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>
|
|
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
|
|
- 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>
|
|
- 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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
While at it, add .yamllint file (copied from releng repo).
Change-Id: I39630c0043fe2fd601510969c401e6cc9efbf69a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
Alexandru Avadanii
Guillermo Herrero
Michael Polenchuk