diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-22 15:36:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-22 15:36:01 +0000 |
| commit | 4489699cb63fadb6939d5c70b49e84bb4f1ff17f (patch) | |
| tree | cfb15692b4983b28013264ab4e0d92b0183ac6e5 /mcp/config | |
| parent | 5c0a09fbd0f377df56bfcfe94b262225a34f98ff (diff) | |
| parent | 87310fb8edfe49b9621fe4410ae52d989072e3c5 (diff) | |
Merge "Adjust memory allocation size"
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml | 5 | ||||
| -rw-r--r-- | mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml | 5 | ||||
| -rw-r--r-- | mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml | 5 | ||||
| -rwxr-xr-x | mcp/config/states/maas | 3 |
4 files changed, 15 insertions, 3 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml index 780edbd81..ad1b8a7ab 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml @@ -8,6 +8,9 @@ virtual: nodes: - cfg01 - mas01 + cfg01: + vcpus: 4 + ram: 6144 mas01: vcpus: 4 - ram: 16384 + ram: 6144 diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml index 6e55038fc..c5820be09 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -9,6 +9,9 @@ virtual: nodes: - cfg01 - mas01 + cfg01: + vcpus: 4 + ram: 6144 mas01: vcpus: 4 - ram: 16384 + ram: 6144 diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml index 2d5339068..20d9107ca 100644 --- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml +++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml @@ -9,6 +9,9 @@ virtual: nodes: - cfg01 - mas01 + cfg01: + vcpus: 4 + ram: 6144 mas01: vcpus: 4 - ram: 16384 + ram: 6144 diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 0d733bafa..11c89c99b 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -111,3 +111,6 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp | wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \ $(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")" + +# Get the latest packages +salt '*' pkg.upgrade refresh=False |