openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix scenario012-standalone ironic job 

Closes-Bug: #1818643
Change-Id: Ifae29d89c0cd14a1f37bc85c37176a1e821a9a10
This commit is contained in:
Derek Higgins 2019-06-06 11:20:36 +01:00 committed by Sagi Shnaidman
parent 9189afc775
commit 67d5ca3538
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/common/ironic_standalone_post.yaml
View File

@ -14,6 +14,7 @@ resources:
type: ../../extraconfig/post_deploy/standalone_post.yaml type: ../../extraconfig/post_deploy/standalone_post.yaml
properties: properties:
servers: {get_param: servers} servers: {get_param: servers}
EndpointMap: {get_param: EndpointMap}
IronicVBMCSetup: IronicVBMCSetup:
type: vbmc_setup.yaml type: vbmc_setup.yaml

7
ci/common/vbmc_setup.yaml
View File

@ -23,7 +23,7 @@ resources:
yum install -y python2-virtualbmc epel-release libvirt-client libvirt-daemon libvirt qemu-kvm-ev yum install -y python2-virtualbmc epel-release libvirt-client libvirt-daemon libvirt qemu-kvm-ev
yum install -y qemu-system-x86 # <-- needs epel yum install -y qemu-system-x86 # <-- needs epel
yum remove -y epel-release yum remove -y epel-release
systemctl start libvirtd systemctl start libvirtd virtualbmc
git clone https://opendev.org/openstack/ironic /tmp/ironic git clone https://opendev.org/openstack/ironic /tmp/ironic
mkdir -p /var/log/bmlogs mkdir -p /var/log/bmlogs
chmod 777 /var/log/bmlogs chmod 777 /var/log/bmlogs
@ -48,6 +48,11 @@ resources:
nohup /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node1 -c 1 -m 3072 -d 10 -b br-ex -p 1161 -M 1350 -f qcow2 -a x86_64 -E qemu -e /usr/bin/qemu-system-x86_64 -l /var/log/bmlogs -A 66:0d:1d:d8:0b:11 > ~zuul/create-node-1.log 2>&1 < /dev/null nohup /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node1 -c 1 -m 3072 -d 10 -b br-ex -p 1161 -M 1350 -f qcow2 -a x86_64 -E qemu -e /usr/bin/qemu-system-x86_64 -l /var/log/bmlogs -A 66:0d:1d:d8:0b:11 > ~zuul/create-node-1.log 2>&1 < /dev/null
nohup /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node2 -c 1 -m 3072 -d 10 -b br-ex -p 1162 -M 1350 -f qcow2 -a x86_64 -E qemu -e /usr/bin/qemu-system-x86_64 -l /var/log/bmlogs -A 66:0d:1d:d8:0b:22 > ~zuul/create-node-2.log 2>&1 < /dev/null & nohup /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node2 -c 1 -m 3072 -d 10 -b br-ex -p 1162 -M 1350 -f qcow2 -a x86_64 -E qemu -e /usr/bin/qemu-system-x86_64 -l /var/log/bmlogs -A 66:0d:1d:d8:0b:22 > ~zuul/create-node-2.log 2>&1 < /dev/null &
vbmc --no-daemon add node1 --port 1161
vbmc --no-daemon start node1
vbmc --no-daemon add node2 --port 1162
vbmc --no-daemon start node2
disown -a disown -a
ExtraDeployments: ExtraDeployments:
type: OS::Heat::SoftwareDeploymentGroup type: OS::Heat::SoftwareDeploymentGroup

7
ci/environments/scenario012-standalone.yaml
View File

@ -19,6 +19,7 @@ resource_registry:
OS::TripleO::NodeExtraConfigPost: ../common/ironic_standalone_post.yaml OS::TripleO::NodeExtraConfigPost: ../common/ironic_standalone_post.yaml
OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml
OS::TripleO::Services::NovaCompute: OS::Heat::None OS::TripleO::Services::NovaCompute: OS::Heat::None
OS::TripleO::Services::NovaLibvirt: OS::Heat::None OS::TripleO::Services::NovaLibvirt: OS::Heat::None
@ -29,14 +30,14 @@ parameter_defaults:
SwiftCeilometerPipelineEnabled: false SwiftCeilometerPipelineEnabled: false
IronicCleaningDiskErase: 'metadata' IronicCleaningDiskErase: 'metadata'
NovaSchedulerDiscoverHostsInCellsInterval: 15 NovaSchedulerDiscoverHostsInCellsInterval: 15
NeutronMechanismDrivers: openvswitch,ansible NeutronMechanismDrivers: ovn,ansible
NeutronNetworkType: vlan NeutronNetworkType: vlan
NeutronTypeDrivers: local,vxlan,vlan,flat NeutronTypeDrivers: local,geneve,vlan,flat
IronicDefaultNetworkInterface: neutron IronicDefaultNetworkInterface: neutron
IronicAutomatedClean: false IronicAutomatedClean: false
NeutronFlatNetworks: datacentre NeutronFlatNetworks: datacentre
NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399' NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399'
ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}} ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}}
NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant' NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'
# Remove ContainerCli once this scenario is tested on CentOS8 # Remove ContainerCli once this scenario is tested on CentOS8.
ContainerCli: docker ContainerCli: docker