openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Translating scenario012 to standalone 

This change adds scenario012-standalone to the list of scenarios, copied
from the scenario012 multinode and translate for use with standalone
Scenario012 multinode was overriding the standard standalone-post
template, to run specific configuration commands to test ironic with
tempest, so a new post template was created, that includes both post
operations

Change-Id: I308f569f41fc1a1c18ad543cf23db4672a3b5eb9
This commit is contained in:
Gabriele Cerami 2019-02-04 15:46:33 +00:00
parent 9689f6ed06
commit 51a1e981f2
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ci/common/ironic_standalone_post.yaml Normal file
View File

@ -0,0 +1,17 @@
heat_template_version: rocky
parameters:
servers:
type: json
resources:
StandaloneStandardExtraConfigPost:
type: ../../extraconfig/post_deploy/standalone_post.yaml
properties:
servers: {get_param: servers}
IronicVBMCSetup:
type: vbmc_setup.yaml
properties:
servers: {get_param: servers}

40
ci/environments/scenario012-standalone.yaml Normal file
View File

@ -0,0 +1,40 @@
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml
OS::TripleO::Services::IronicPxe: ../../deployment/ironic/ironic-pxe-container-puppet.yaml
# These enable Pacemaker
OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml
OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml
# Some infra instances don't pass the ping test but are otherwise working.
# Since the OVB jobs also test this functionality we can shut it off here.
OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
OS::TripleO::NodeExtraConfigPost: ../common/ironic_standalone_post.yaml
OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
OS::TripleO::Services::NovaCompute: OS::Heat::None
OS::TripleO::Services::NovaLibvirt: OS::Heat::None
parameter_defaults:
Debug: true
DockerPuppetDebug: True
NotificationDriver: 'noop'
SwiftCeilometerPipelineEnabled: false
IronicCleaningDiskErase: 'metadata'
NovaSchedulerDiscoverHostsInCellsInterval: 15
NeutronMechanismDrivers: openvswitch,ansible
NeutronNetworkType: vlan
NeutronTypeDrivers: local,vxlan,vlan,flat
IronicDefaultNetworkInterface: neutron
IronicAutomatedClean: false
NeutronFlatNetworks: datacentre
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"}}
NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'