Migrate cfg01 node to cloud
Migrate cfg01 for bm ovs env
Change-Id: Iaaa4e767064d7b7cd58353f7fd089701cc60ee9b
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 4625136..d8fb608 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -714,7 +714,7 @@
reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
- salt_master_address: 10.167.11.2
+ salt_master_address: 10.167.11.5
salt_master_hostname: cfg01
salt_master_management_address: 172.16.164.2
shared_reclass_branch: proposed
@@ -826,7 +826,7 @@
openstack_create_public_network: 'True'
openstack_public_neutron_subnet_gateway: 172.17.42.1
openstack_public_neutron_subnet_cidr: 172.17.42.0/26
- openstack_public_neutron_subnet_allocation_start: 172.17.42.15
+ openstack_public_neutron_subnet_allocation_start: 172.17.42.20
openstack_public_neutron_subnet_allocation_end: 172.17.42.55
backend_vlan: '2402'
storage_vlan: '2405' # not implemented yet, placeholder
@@ -849,3 +849,13 @@
secrets_encryption_private_key: ''
cinder_backup_engine: 'ceph'
cinder_ceph_backup_pool_name: 'backups'
+ openstack_keystone_security:
+ disable_user_account_days_inactive: 7
+ lockout_failure_attempts: 60
+ lockout_duration: 600
+ password_expires_days: 730
+ unique_last_password_count: 5
+ minimum_password_age: 0
+ password_regex: "'^[a-zA-Z0-9~!@#%^&\\*_=+]{32,}$$'"
+ password_regex_description: "Your password could contains capital letters, lowercase letters, digits, symbols '~ ! @ # % ^ & * _ = +' and have a minimum length of 32 characters"
+ change_password_upon_first_use: False
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt.yaml
index 7295ad9..5f7d480 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt.yaml
@@ -1,6 +1,6 @@
-{% from 'bm-cicd-queens-ovs-maas/underlay.yaml' import HOSTNAME_CFG01 with context %}
-{% from 'bm-cicd-queens-ovs-maas/underlay.yaml' import LAB_CONFIG_NAME with context %}
-{% from 'bm-cicd-queens-ovs-maas/underlay.yaml' import DOMAIN_NAME with context %}
+{% set HOSTNAME_CFG01='cfg01.bm-cicd-queens-ovs-maas.local' %}
+{% set LAB_CONFIG_NAME='bm-cicd-queens-ovs-maas' %}
+{% set DOMAIN_NAME='bm-cicd-queens-ovs-maas.local' %}
{% import 'shared-salt.yaml' as SHARED with context %}
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay--user-data-foundation.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay--user-data-foundation.yaml
new file mode 100644
index 0000000..c9fd9d6
--- /dev/null
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay--user-data-foundation.yaml
@@ -0,0 +1,82 @@
+#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
+
+ssh_pwauth: True
+users:
+ - name: root
+ sudo: ALL=(ALL) NOPASSWD:ALL
+ shell: /bin/bash
+ - name: jenkins
+ sudo: ALL=(ALL) NOPASSWD:ALL
+ shell: /bin/bash
+ ssh_authorized_keys:
+ - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFSxeuXh2sO4VYL8N2dlNFVyNcr2RvoH4MeDD/cV2HThfU4/BcH6IOOWXSDibIU279bWVKCL7QUp3mf0Vf7HPuyFuC12QM+l7MwT0jCYh5um3hmAvM6Ga0nkhJygHexe9/rLEYzZJkIjP9/IS/YXSv8rhHg484wQ6qkEuq15nyMqil8tbDQCq0XQ+AWEpNpIa4pUoKmFMsOP8lq10KZXIXsJyZxizadr6Bh4Lm9LWrk8YCw7qP3rmgWxK/s8qXQh1ISZe6ONfcmk6p03qbh4H3CwKyWzxmnIHQvE6PgN/O+PuAZj3PbR2mkkJjYX4jNPlxvj8uTStaVPhAwfR9Spdx jenkins@cz8133
+
+disable_root: false
+chpasswd:
+ list: |
+ root:r00tme
+ jenkins:qalab
+ expire: False
+
+packages:
+ - openjdk-8-jre-headless
+ - libyaml-dev
+ - libffi-dev
+ - libvirt-dev
+ - python-dev
+ - python-pip
+ - python-virtualenv
+ #- python-psycopg2
+ - pkg-config
+ - vlan
+ - bridge-utils
+ - ebtables
+
+bootcmd:
+ # Enable root access
+ - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
+ - service sshd restart
+output:
+ all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
+
+runcmd:
+ # Create swap
+ - fallocate -l 16G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+ - find /etc/network/interfaces.d/ -type f -delete
+ - kill $(pidof /sbin/dhclient) || /bin/true
+ - ip a flush dev ens3
+ - ip a flush dev ens4
+ - rm -f /var/run/network/ifstate.ens3
+ - rm -f /var/run/network/ifstate.ens4
+ - ip route delete default || /bin/true
+ - ifup ens3
+ - ifup ens4
+
+write_files:
+ - path: /etc/default/grub.d/97-enable-grub-menu.cfg
+ content: |
+ GRUB_RECORDFAIL_TIMEOUT=30
+ GRUB_TIMEOUT=3
+ GRUB_TIMEOUT_STYLE=menu
+
+ - path: /etc/network/interfaces
+ content: |
+ auto ens3
+ iface ens3 inet static
+ address $management_static_ip
+ netmask 255.255.255.192
+ gateway $management_gw
+ dns-nameservers $dnsaddress
+
+ auto ens4
+ iface ens4 inet static
+ address $control_static_ip
+ netmask 255.255.255.0
+
+ - path: /etc/bash_completion.d/fuel_devops30_activate
+ content: |
+ source /home/jenkins/fuel-devops30/bin/activate
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay-userdata.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay-userdata.yaml
new file mode 100644
index 0000000..567a445
--- /dev/null
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay-userdata.yaml
@@ -0,0 +1,78 @@
+#cloud-config, see http://cloudinit.readthedocs.io/en/latest/topics/examples.html
+
+ssh_pwauth: True
+users:
+ - name: root
+ sudo: ALL=(ALL) NOPASSWD:ALL
+ shell: /bin/bash
+
+disable_root: false
+chpasswd:
+ list: |
+ root:r00tme
+ expire: False
+
+bootcmd:
+ # Enable root access
+ - sed -i -e '/^PermitRootLogin/s/^.*$/PermitRootLogin yes/' /etc/ssh/sshd_config
+ - service sshd restart
+output:
+ all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
+
+runcmd:
+ - if lvs vg0; then pvresize /dev/vda3; fi
+ - if lvs vg0; then /usr/bin/growlvm.py --image-layout-file /usr/share/growlvm/image-layout.yml; fi
+
+ - export TERM=linux
+ - export LANG=C
+ # Configure dhclient
+ - sudo resolvconf -u
+ #- sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
+ # Enable grub menu using updated config below
+ - update-grub
+
+ # Prepare network connection
+ - sudo ifup ens3
+ #- sudo route add default gw {gateway} {interface_name}
+
+ # Create swap
+ - fallocate -l 16G /swapfile
+ - chmod 600 /swapfile
+ - mkswap /swapfile
+ - swapon /swapfile
+ - echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+
+write_files:
+ - path: /etc/default/grub.d/97-enable-grub-menu.cfg
+ content: |
+ GRUB_RECORDFAIL_TIMEOUT=30
+ GRUB_TIMEOUT=3
+ GRUB_TIMEOUT_STYLE=menu
+
+ - path: /etc/network/interfaces
+ content: |
+ auto ens3
+ iface ens3 inet dhcp
+
+ - path: /usr/share/growlvm/image-layout.yml
+ content: |
+ root:
+ size: '65%VG'
+ home:
+ size: '1%VG'
+ var_log:
+ size: '10%VG'
+ var_log_audit:
+ size: '5%VG'
+ var_tmp:
+ size: '10%VG'
+ tmp:
+ size: '5%VG'
+ owner: root:root
+
+growpart:
+ mode: auto
+ devices:
+ - '/'
+ - '/dev/vda3'
+ ignore_growroot_disabled: false
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
new file mode 100644
index 0000000..060ddab
--- /dev/null
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
@@ -0,0 +1,99 @@
+---
+
+heat_template_version: queens
+
+description: MCP environment for bm-cicd-queens-ovs-maas
+
+parameters:
+ instance_domain:
+ type: string
+ default: bm-cicd-queens-ovs-maas.local
+ mcp_version:
+ type: string
+ env_name:
+ type: string
+ key_pair:
+ type: string
+ cfg_flavor:
+ type: string
+ foundation_image:
+ type: string
+ foundation_flavor:
+ type: string
+
+resources:
+ subnets:
+ type: MCP::Subnets
+ properties:
+ stack_name: { get_param: "OS::stack_name" }
+ env_name: { get_param: env_name }
+ management_net: 'system-phys-2401'
+ control_net: 'system-phys-2404'
+ tenant_net: 'system-phys-2406'
+ external_net: 'system-phys-2403'
+
+ #flavors:
+ # type: MCP::Flavors
+
+ cfg01_node:
+ type: MCP::MasterNode
+ depends_on: [subnets]
+ properties:
+ env_name: { get_param: env_name }
+ mcp_version: { get_param: mcp_version }
+ cfg01_flavor: { get_param: cfg_flavor }
+ management_net: 'system-phys-2401'
+ control_net: 'system-phys-2404'
+ tenant_net: 'system-phys-2406'
+ external_net: 'system-phys-2403'
+ tenant_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, tenant_net_prefix] }, '5' ]
+ external_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, external_net_prefix] }, '5' ]
+ instance_name: cfg01
+ instance_domain: {get_param: instance_domain}
+
+ foundation_node:
+ type: MCP::FoundationNode
+ depends_on: [subnets]
+ properties:
+ env_name: { get_param: env_name }
+ mcp_version: { get_param: mcp_version }
+ instance_domain: {get_param: instance_domain}
+ instance_name: foundation
+ management_net: 'system-phys-2401'
+ control_net: 'system-phys-2404'
+ tenant_net: 'system-phys-2406'
+ external_net: 'system-phys-2403'
+ instance_image: { get_param: foundation_image }
+ instance_flavor: {get_param: foundation_flavor}
+ underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
+ management_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, management_net_prefix] }, '62' ]
+ control_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, control_net_prefix] }, '6' ]
+ tenant_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, tenant_net_prefix] }, '6' ]
+ external_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, external_net_prefix] }, '6' ]
+ instance_config_host: { get_attr: [cfg01_node, instance_address] }
+outputs:
+ foundation_public_ip:
+ description: foundation node IP address (management)
+ value:
+ get_attr:
+ - foundation_node
+ - instance_address
+...
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.yaml
deleted file mode 100644
index 9ed29bc..0000000
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.yaml
+++ /dev/null
@@ -1,127 +0,0 @@
-# Set the repository suite, one of the: 'nightly', 'testing', 'stable', or any other required
-{% set REPOSITORY_SUITE = os_env('REPOSITORY_SUITE', 'proposed') %}
-{% set LAB_CONFIG_NAME = os_env('LAB_CONFIG_NAME', 'bm-cicd-queens-ovs-maas') %}
-{% set DOMAIN_NAME = os_env('DOMAIN_NAME', LAB_CONFIG_NAME + '.local') %}
-{% set HOSTNAME_CFG01 = os_env('HOSTNAME_CFG01', 'cfg01.' + DOMAIN_NAME) %}
-
-{% set ETH1_IP_ADDRESS_CFG01 = os_env('ETH1_IP_ADDRESS_CFG01', '172.16.164.2') %}
-
----
-aliases:
- - &interface_model {{ os_env('INTERFACE_MODEL', 'virtio') }}
- - &cloudinit_meta_data {{ CLOUDINIT_META_DATA }}
- - &cloudinit_user_data_cfg01 {{ CLOUDINIT_USER_DATA_CFG01 }}
-
-template:
- devops_settings:
- env_name: {{ os_env('ENV_NAME', 'bm-cicd-queens-ovs-maas_' + REPOSITORY_SUITE + "_" + os_env('BUILD_NUMBER', '')) }}
-
- address_pools:
- admin-pool01:
- net: {{ os_env('ADMIN_ADDRESS_POOL01', '172.16.164.0/26:26') }}
- params:
- ip_reserved:
- gateway: +1
- l2_network_device: +1
- default_{{ HOSTNAME_CFG01 }}: {{ ETH1_IP_ADDRESS_CFG01 }}
- ip_ranges:
- dhcp: [+2, -4]
- private-pool01:
- net: {{ os_env('PRIVATE_ADDRESS_POOL01', '10.167.11.0/24:24') }}
- params:
- ip_reserved:
- gateway: +1
- l2_network_device: +1
- ip_ranges:
- dhcp: [+2, -4]
-
- tenant-pool01:
- net: {{ os_env('TENANT_ADDRESS_POOL01', '10.167.12.0/24:24') }}
- params:
- ip_reserved:
- gateway: +1
- l2_network_device: +1
- ip_ranges:
- dhcp: [+2, -4]
-
- external-pool01:
- net: {{ os_env('EXTERNAL_ADDRESS_POOL01', '172.17.42.0/26:26') }}
- params:
- ip_reserved:
- gateway: '172.17.42.1'
- ip_ranges:
- dhcp: ['172.17.42.10', '172.17.42.20']
-
-
- groups:
- - name: default
- driver:
- name: devops.driver.libvirt
- params:
- connection_string: !os_env CONNECTION_STRING, qemu:///system
- storage_pool_name: !os_env STORAGE_POOL_NAME, default
- stp: False
- hpet: False
- enable_acpi: true
- use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
- use_hugepages: !os_env DRIVER_USE_HUGEPAGES, false
-
- network_pools:
- admin: admin-pool01
-
- l2_network_devices:
- # maas management interface
- admin:
- address_pool: admin-pool01
- dhcp: false
- forward:
- mode: bridge
- parent_iface:
- phys_dev: !os_env LAB_MANAGEMENT_IFACE
- private:
- address_pool: private-pool01
- dhcp: false
- forward:
- mode: bridge
- parent_iface:
- phys_dev: !os_env LAB_CONTROL_IFACE
-
- group_volumes:
- - name: cfg01_day01_image # Pre-configured day01 image
- source_image: {{ os_env('IMAGE_PATH_CFG01_DAY01') }} # http://images.mirantis.com/cfg01-day01.qcow2 or fallback to IMAGE_PATH1604
- format: qcow2
-
- nodes:
- - name: {{ HOSTNAME_CFG01 }}
- role: salt_master
- params:
- vcpu: !os_env SLAVE_NODE_CPU, 8
- memory: !os_env SLAVE_NODE_MEMORY, 20480
- boot:
- - hd
- volumes:
- - name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
- backing_store: cfg01_day01_image
- format: qcow2
- - name: config
- capacity: 1
- format: raw
- device: cdrom
- bus: ide
-
- interfaces:
- - label: ens3
- l2_network_device: admin
- interface_model: *interface_model
- - label: ens4
- l2_network_device: private
- interface_model: *interface_model
-
- network_config:
- ens3:
- networks:
- - admin
- ens4:
- networks:
- - private