Age | Commit message (Collapse) | Author | Files | Lines |
|
* Update docs/submodules/fuel from branch 'master'
- salt master, maas: Move mcpcontrol to 10.20.0.0/24
Use INSTALLER_IP Jenkins param instead of SALT_MASTER_IP, allowing
us to drop SALT_MASTER_IP completely from releng.
mcpcontrol IP changes:
- 192.168.10.100 becomes 10.20.0.2 (align with legacy Fuel master);
- 192.168.10.3 becomes 10.20.0.3 (baremetal MaaS address);
JIRA: FUEL-285
Change-Id: I6e2d44c3a8b43846196bd64191735214167a76ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge changes from topic 'multiarch-image-defaults'
* changes:
reclass: virtual: Factor out VM interface naming
reclass: Multiarch support for arch specific param
- reclass: virtual: Factor out VM interface naming
Define two groups of VM interface naming:
- ens3..ens6 - used by infra VMs, virtual node VMs;
- ens2..ens3 - used by VCP VMs (spawned by salt.control);
Parametrize newly defined interface names throughout the cluster
models.
While at it, add AArch64 default values for above iface names.
NOTE: baremetal clusters will be parametrized later, after common
config is factored out into <baremetal-mcp-ocata-common>.
Change-Id: I89aba9aaf85b585cc510302eb76d7810fbf60679
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
- reclass: Multiarch support for arch specific param
Introduce a simple mechanism that simulates an 'if-arch-then' cond
for reclass models:
- add new <all-mcp-ocata-common> class hierarchy;
- at runtime (via <salt.sh>) make 'all-mcp-ocata-common.arch' point
to 'all-mcp-ocata-common.$(uname -i)' dynamically;
- inherit new 'arch' class in all cluster models;
- factor out current x86_64 default for "salt_control_xenial_image";
- add AArch64 default for param "salt_control_xenial_image";
Change-Id: I3b239b28d0fd1cc2ced8579e2e93b764eb71ffc3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- README files: Convert from markdown to RST
Change-Id: I176f583e8adb7ba717932de7c27283f696ded548
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "Add & fix licensing in README.rst files, align ext"
- Add & fix licensing in README.rst files, align ext
Rename all variations of README files to README.rst.
Fix license headers according to OPNFV Contribution Guidelines [1].
Markdown syntax will be switched to rst in an ulterior change.
[1] https://wiki.opnfv.org/display/DEV/Contribution+Guidelines
Change-Id: I2c71fd62b38f218545507c79c39e07dbd35f7c88
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "os_cacert: Parametrize VIP used in path by cp.push"
- os_cacert: Parametrize VIP used in path by cp.push
JIRA: FUEL-274
Change-Id: Ia77948ba3e99c47aa86fcca20c67d80e2e761208
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "scenario: Add AArch64 defaults"
- scenario: Add AArch64 defaults
Move scenario defaults.yml out of virtual/baremetal dirs, unifying
them into a single, arch-specific defaults configuration file.
Add AArch64 equivalent config, and arch-qualify default filename.
For AArch64, bump VCPU number from 2 to 6.
Change-Id: If9b39850af96e4c46e868b1d532bd301f9fd9f26
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "reclass: virtual: Factor out common infra config"
- reclass: virtual: Factor out common infra config
Change-Id: I669a81cf46a4ac988a1ea04c3b9d297ae67a0a62
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "log.sh: Collect /var/log from cluster nodes"
- log.sh: Collect /var/log from cluster nodes
Bring back <ci/deploy.sh> parameter `-L`, which is already passed by
releng deploy script.
Since we need to enable file_recv on salt master, do so by adding a
new class in <virtual-mcp-ocata-common/infra/config.yml>, which will
be inherited by all scenario reclass models.
JIRA: FUEL-288
Change-Id: I9b649315984fb8580b63883d0e06c1e1efd11057
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- bash scripts: Fix remaining shellcheck warn/errs
Fix/silence all shellcheck errors, except for scripts in
<prototypes/sfc_tacker>.
Change-Id: Idc317cdba0f69b78299f2d3665e72ffc19dd8af5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "Move mcp.rsa to /var/lib/opnfv"
- Move mcp.rsa to /var/lib/opnfv
JIRA: FUEL-280
Change-Id: I1e07b0e1597b2a1e4a92e1274f89dda62cb81bb8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "lib.sh: Remove all storage on undefine"
- lib.sh: Remove all storage on undefine
While executing the deploy script via sudo will raise no issues with
re-using old storage volume files, non-root deploys fail to change
ownership of said files.
Properly clean after ourselves when destroying and undefining VMs.
JIRA: ARMBAND-311
Change-Id: I7fdd269dccbfd5ab5285d852ac7dacfc4dc5ccd7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [ovs/dpdk] Mend dpdk settings
* add vcpus to virtual compute
* re-pin dpdk core & pmds
* switch to UCA repos
* disable apt-daily cron job
Change-Id: Ia23100b846d8954e3d5e8a264a6b8518402b2fa6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "cleanup: Rename ODL-L3 to ODL, drop ODL-L2"
- cleanup: Rename ODL-L3 to ODL, drop ODL-L2
JIRA: FUEL-279
Change-Id: Ia8bed5e09937a1ffd29a15d40f610d4b0c8f0a17
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "Initialize mongodb cluster"
- Initialize mongodb cluster
* wait for mongodb service ready state
* run rs.initiate() to start a replication set
Change-Id: Ia9d2357d2ce0e9ba92a6be3d8b6c068efaa10822
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Configure SubjectAltName for the proxy cert
In order to avoid SubjectAltName warnings,
bring it into proxy ssl certificate.
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Change-Id: I46fe9697469354bc028039cc1f030baae1ccd7fb
|
|
* Update docs/submodules/fuel from branch 'master'
- patches: deepclean: Locate toplevel for submodules
Change-Id: Ibcc4364a57d888773fcb466f603c2046e1a4a2e3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- ci/deploy.sh: Remove extra '-s' in image dir path
Change-Id: Iabadd8565b7fcac6d3361200f30310391daf6648
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [baremetal] Enable ceilometer/aodh services
Change-Id: I34706afbdbcbdaace0b0ae6c2c2e8cb932812d4e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "build, deploy: Remove obsolete Fuel@Openstack code"
- build, deploy: Remove obsolete Fuel@Openstack code
JIRA: FUEL-278
Change-Id: I30c04c325de5ac97aee172386de43201988646c5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "ci/deploy.sh, lib.sh: Align SSH_KEY with Jenkins"
- ci/deploy.sh, lib.sh: Align SSH_KEY with Jenkins
Jenkins defines a build param also called SSH_KEY, which holds
the full path to our MCP private RSA key, as opposed to Fuel@OPNFV,
which uses the file basename as SSH_KEY.
Switch to using full path in SSH_KEY, while also moving the key
outside /tmp.
NOTE: When running `ci/deploy.sh` with sudo, key will land in
/root/opnfv/mcp.rsa unless SSH_KEY is set via env var.
While at it, bring back VM image storage dir param, allowing us
to drop one more reference to /tmp.
JIRA: FUEL-280
Change-Id: Id1cfa6dbe7b2e6f3915b22281da5957333718401
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "salt.sh: Execute deepclean before importing patches"
- salt.sh: Execute deepclean before importing patches
Deepcleaning can be useful when deploying from an existing local repo
Change-Id: I3908d6533c744da7cc863a250f4158c6c0e8e169
Signed-off-by: Junaid Ali <junaidali.yahya@gmail.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- lib.sh: Limit envsubst to certain variables
This will prevent envsubst from expanding the SALT_REPO local
variable in user-data.template.
Change-Id: Idcc3ea827293ac0d3b4059776f90bbbcf807daec
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- patches/scripts: Fix whitespace in context
git option '--ignore-whitespace' has issues, at least on certain
versions of git, like 2.7.4.
Work around it by adding the trailing whitespace we previously
removed in patch context lines.
Change-Id: Id192a87ec92c798fa808bb8ef38384160ee3faf5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "salt.sh, user-data: Add Saltstack arm64 repo"
- salt.sh, user-data: Add Saltstack arm64 repo
These changes will only be applied on AArch64, based on `uname -m`.
While at it, add arm64 suppport to salt-master-setup.sh.
Upstream commit [1] broke Salt bootstrap on AArch64, by
introducing an architecture condition that is too strict to allow
Debian package installation (even if we provide our own repo).
Add "arm64" to the list of supported architectures. This needs
to be done on the fly, as the bootstrap script is fetched using
`curl` from <salt-master-setup.sh>.
[1] https://github.com/saltstack/salt-bootstrap/commit/caa6d7d
Change-Id: Id706a74a52ffe2f8b8c9dd3b9f70c78f35b2f745
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [baremetal] Enable cinder-volume service
Change-Id: I60a5566de43ca58f3f172611c95546b1353f8406
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Locate toplevel for git submodule [2]
Change-Id: I0c719ec4cfd3d0a526fd6913358cc80c5a599985
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- submodules: Disable remote tracking
Stop following remote master HEAD refs for git submodules.
This should fix recent deploy failures caused by upstream changes in
salt-formulas-scripts repo.
Change-Id: I32b422f2dd7d31d51c65f1cd0101111e9ed2fb5e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [baremetal] Tune dpdk/compute cpu pinning
Change-Id: I733c6c9f1f5aa559084998aa9bc639079bda83a5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "mcp/deploy/scripts: Move to git submodule"
- mcp/deploy/scripts: Move to git submodule
Change-Id: I65d1f5680000011493bde17a249a87738ebfdd96
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [baremetal] Adjust vcp nodes memory size
Change-Id: I8937f4f676a48c852bece0680da0b559df7c2e7c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "Fix ssl cert upload path"
- Fix ssl cert upload path
JIRA: FUEL-274
Change-Id: I8e947009399a995474ed0088d56da04755d278df
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Update salt init scripts source
Change-Id: I269e397b78d55794b1c49bf582cc0e663cbe9ca6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "lib.sh: Reuse /tmp/mcp.rsa if present"
- lib.sh: Reuse /tmp/mcp.rsa if present
Long-term, /tmp/mcp.rsa should be moved to a persistent location [1],
and made configurable via env var / other mechanisms.
This will allow us to:
- use an existing keypair (provided by end-user in expected path);
- login to previous deployment machines (e.g. to cleanup UEFI boot
entries before destroying the cluster and rebuilding it);
- split deploy in re-entrant stages (salt master only, cluster nodes
only; similar to old Fuel, where we could reuse old Fuel VM);
[1] https://jira.opnfv.org/browse/FUEL-280
Change-Id: I1e53321ed1cfc217ff95e809c867fa3370c479c9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- states: maas: Retry linux state if no response
JIRA: FUEL-283
Change-Id: Ie85af8c12163fac28cb8826aa8902a4ff3dec623
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- patches: seedng: Fix arg order for salt-bootstrap
JIRA: FUEL-282
Change-Id: I8ba64024c884e2f805d4cda670333ac787fac25c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- reclass: virtual-mcp-ocata-ovs: Fix yaml typo
Change-Id: Icc283315bbf0df825e9836913deff821bad1123a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "[virtual] Apply ceilometer/aodh services"
- [virtual] Apply ceilometer/aodh services
* run ceilometer/aodh states
* wrap common virtual cluster options
* get the source image based on timestamps
Change-Id: I88f1d63ed4a94eba4ec0a9cf33d36d51c75ae355
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [baremetal] Return back custom image for vcp nodes
Virtual node based on cloud ubuntu image
won't register as a minion on salt master.
Change-Id: Ia32eae01a5633042189cdebebcba8043cae61503
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- patches: seedng: module: Sync salt version
JIRA: FUEL-282
Change-Id: I6c86ce0b1113ca674b1756e7997559eee90a4e5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Sync os cacert from proxy to salt master
JIRA: FUEL-274
Change-Id: I2c8161b24cb18a0d1f9dc6fd509ce18af7ea8cf5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [baremetal] Add required user on vcp nodes
* add user of "ubuntu" so that functest gets cluster credentials
* reduce cpu resources for vcp nodes in nofeature scenario
* tune salt targets for maas state
* specify ntp servers
Change-Id: I433a1de1cd2c69c6747c62c3359f5485dee3bfa4
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [baremetal] Bring in ovs/dpdk scenario
Change-Id: Ia0d828fa31549a12b6740e0edeeba2ab13a9b998
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "MaaS: commissioning/deployment retry"
- MaaS: commissioning/deployment retry
While at it, parametrize max attempt number in maas state's "wait_for",
and reduce retries count for certain simpler tasks.
Change-Id: I3ac2877719cdd32613bcf41186ebbb9f3f3aee93
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "ci/deploy.sh, states: bash debug, continue on err"
- ci/deploy.sh, states: bash debug, continue on err
Since we don't `set -e` in state files, applying each state will
always succeed unless the last instruction in the state fails.
Make this uniform by always succeeding in applying the state.
While at it, enable bash debugging logs, for better readability
of deploy log files.
Change-Id: I3cf4886f6d73c6fd1380df1a4e1413334bec1701
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [baremetal] Bring in opendaylight scenario
Change-Id: I3a9bb25fc7514055da588b9047f61af178eff222
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Locate toplevel for git submodule
Prior to git 1.8.4 the current working dir has to
be at top-level to run git submodule update.
Change-Id: I4d6c052364863f965e8140e56af17c09ee39ed59
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Merge "states/network: parametrize Openstack public net"
- states/network: parametrize Openstack public net
Determine public network based on public IPs of compute nodes.
Change-Id: I5a6b29a0458b0b839f8fdb3e32616a41d7a621f7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- states/maas: Add mcp.rsa.pub to authorized_keys
Add our mcp.rsa.pub RSA key to all nodes, including VCP VMs.
This is required for functest to be able to fetch openrc.
While at it, add retry wrappers for more VCP VM state.sls calls.
Change-Id: I34f79848c52e36de8d981055880321a081420874
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Configure neutron gateway
Change-Id: I01744bd5728d6fc4c8cd3792aee9759434d18645
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- Return back infra interfaces config
Change-Id: I4baa9940ae14ef6e084fda7169ec43be7cf3f449
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
|