diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-25 15:47:55 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-28 14:11:39 +0000 |
| commit | 08bb570b39b123c5a5adf70e34e05bb43a6e3387 (patch) | |
| tree | 2ff9a64d9393b9951f16918d0fed2ed5db160f60 /mcp/reclass/classes | |
| parent | f2ea17e489b4c3f5e0b5cdc75860b094f3a05b90 (diff) | |
[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>
Diffstat (limited to 'mcp/reclass/classes')
5 files changed, 17 insertions, 8 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index 5862ddb1d..e67a06d2e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -35,6 +35,9 @@ parameters: infra_kvm_node02_hostname: kvm02 infra_kvm_node03_hostname: kvm03 + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org + # Interface definitions reclass: storage: @@ -51,7 +54,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 - salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 + salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: network: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml index ac7174056..1397daf57 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml @@ -35,6 +35,9 @@ parameters: infra_kvm_node02_hostname: kvm02 infra_kvm_node03_hostname: kvm03 + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org + # Interface definitions reclass: storage: @@ -51,7 +54,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 - salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 + salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: network: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml index e3d47b03c..8bf43be16 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml @@ -35,6 +35,9 @@ parameters: infra_kvm_node02_hostname: kvm02 infra_kvm_node03_hostname: kvm03 + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org + # Interface definitions reclass: storage: @@ -51,7 +54,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 - salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 + salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: network: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml index 1608c65bf..44301a019 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml @@ -31,27 +31,27 @@ parameters: size: #RAM 4096,8192,16384,32768,65536 ##Default production sizing openstack.control: - cpu: 6 + cpu: 4 ram: 8192 disk_profile: small net_profile: default openstack.database: - cpu: 6 + cpu: 4 ram: 8192 disk_profile: large net_profile: default openstack.message_queue: - cpu: 6 + cpu: 4 ram: 8192 disk_profile: small net_profile: default openstack.telemetry: - cpu: 4 + cpu: 2 ram: 4096 disk_profile: xxlarge net_profile: default openstack.proxy: - cpu: 4 + cpu: 2 ram: 4096 disk_profile: small net_profile: default diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system -Subproject 420f63ed1eb4b1dfde55d7a5ec32eba998aefb2 +Subproject fc30e3196598bb01f8807d90113d7b8c0794ea9 |