diff options
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/disable-telemetry.yaml | 3 | ||||
| -rw-r--r-- | environments/docker-centos-tripleoupstream.yaml | 229 | ||||
| -rw-r--r-- | environments/docker-services-tls-everywhere.yaml | 15 | ||||
| -rw-r--r-- | environments/docker.yaml | 15 | ||||
| -rw-r--r-- | environments/neutron-ml2-bigswitch.yaml | 1 | ||||
| -rw-r--r-- | environments/overcloud-baremetal.j2.yaml | 1 | ||||
| -rw-r--r-- | environments/overcloud-services.yaml | 3 | ||||
| -rw-r--r-- | environments/services-docker/congress.yaml | 2 | ||||
| -rw-r--r-- | environments/services-docker/manila.yaml | 1 | ||||
| -rw-r--r-- | environments/services/neutron-lbaasv2.yaml | 18 |
10 files changed, 148 insertions, 140 deletions
diff --git a/environments/disable-telemetry.yaml b/environments/disable-telemetry.yaml index 6249c286..52d0d27b 100644 --- a/environments/disable-telemetry.yaml +++ b/environments/disable-telemetry.yaml @@ -18,3 +18,6 @@ resource_registry: OS::TripleO::Services::AodhNotifier: OS::Heat::None OS::TripleO::Services::AodhListener: OS::Heat::None OS::TripleO::Services::PankoApi: OS::Heat::None + +parameter_defaults: + NotificationDriver: 'noop' diff --git a/environments/docker-centos-tripleoupstream.yaml b/environments/docker-centos-tripleoupstream.yaml index 648c8c26..d94ac6d7 100644 --- a/environments/docker-centos-tripleoupstream.yaml +++ b/environments/docker-centos-tripleoupstream.yaml @@ -1,109 +1,122 @@ +# Generated with the following on 2017-07-12T11:40:50.219622 +# +# overcloud container image prepare --env-file environments/docker-centos-tripleoupstream.yaml +# + parameter_defaults: - #DockerAodhApiImage: 'tripleoupstream/centos-binary-aodh-api:latest' - #DockerAodhConfigImage: 'tripleoupstream/centos-binary-aodh-api:latest' - #DockerAodhEvaluatorImage: 'tripleoupstream/centos-binary-aodh-evaluator:latest' - #DockerAodhListenerImage: 'tripleoupstream/centos-binary-aodh-listener:latest' - #DockerAodhNotifierImage: 'tripleoupstream/centos-binary-aodh-notifier:latest' - #DockerCeilometerCentralImage: 'tripleoupstream/centos-binary-ceilometer-central:latest' - #DockerCeilometerComputeImage: 'tripleoupstream/centos-binary-ceilometer-compute:latest' - #DockerCeilometerConfigImage: 'tripleoupstream/centos-binary-ceilometer-central:latest' - #DockerCeilometerIpmiImage: 'tripleoupstream/centos-binary-ceilometer-ipmi:latest' - #DockerCeilometerNotificationImage: 'tripleoupstream/centos-binary-ceilometer-notification:latest' - #DockerCinderApiImage: 'tripleoupstream/centos-binary-cinder-api:latest' - #DockerCinderBackupImage: 'tripleoupstream/centos-binary-cinder-backup:latest' - #DockerCinderConfigImage: 'tripleoupstream/centos-binary-cinder-api:latest' - #DockerCinderSchedulerImage: 'tripleoupstream/centos-binary-cinder-scheduler:latest' - #DockerCinderVolumeImage: 'tripleoupstream/centos-binary-cinder-volume:latest' - #DockerClustercheckConfigImage: 'tripleoupstream/centos-binary-mariadb:latest' - #DockerClustercheckImage: 'tripleoupstream/centos-binary-mariadb:latest' - #DockerCollectdConfigImage: 'tripleoupstream/centos-binary-collectd:latest' - #DockerCollectdImage: 'tripleoupstream/centos-binary-collectd:latest' - #DockerCongressApiImage: 'tripleoupstream/centos-binary-congress-api:latest' - #DockerCongressConfigImage: 'tripleoupstream/centos-binary-congress-api:latest' - #DockerEc2ApiConfigImage: 'tripleoupstream/centos-binary-ec2-api:latest' - #DockerEc2ApiImage: 'tripleoupstream/centos-binary-ec2-api:latest' - #DockerEtcdConfigImage: 'tripleoupstream/centos-binary-etcd:latest' - #DockerEtcdImage: 'tripleoupstream/centos-binary-etcd:latest' - #DockerGlanceApiConfigImage: 'tripleoupstream/centos-binary-glance-api:latest' - #DockerGlanceApiImage: 'tripleoupstream/centos-binary-glance-api:latest' - #DockerGnocchiApiImage: 'tripleoupstream/centos-binary-gnocchi-api:latest' - #DockerGnocchiConfigImage: 'tripleoupstream/centos-binary-gnocchi-api:latest' - #DockerGnocchiMetricdImage: 'tripleoupstream/centos-binary-gnocchi-metricd:latest' - #DockerGnocchiStatsdImage: 'tripleoupstream/centos-binary-gnocchi-statsd:latest' - #DockerHAProxyConfigImage: 'tripleoupstream/centos-binary-haproxy:latest' - #DockerHAProxyImage: 'tripleoupstream/centos-binary-haproxy:latest' - #DockerHeatApiCfnConfigImage: 'tripleoupstream/centos-binary-heat-api-cfn:latest' - #DockerHeatApiCfnImage: 'tripleoupstream/centos-binary-heat-api-cfn:latest' - #DockerHeatApiConfigImage: 'tripleoupstream/centos-binary-heat-api:latest' - #DockerHeatApiImage: 'tripleoupstream/centos-binary-heat-api:latest' - #DockerHeatConfigImage: 'tripleoupstream/centos-binary-heat-api:latest' - #DockerHeatEngineImage: 'tripleoupstream/centos-binary-heat-engine:latest' - #DockerHorizonConfigImage: 'tripleoupstream/centos-binary-horizon:latest' - #DockerHorizonImage: 'tripleoupstream/centos-binary-horizon:latest' - #DockerIronicApiImage: 'tripleoupstream/centos-binary-ironic-api:latest' - #DockerIronicConductorImage: 'tripleoupstream/centos-binary-ironic-conductor:latest' - #DockerIronicConfigImage: 'tripleoupstream/centos-binary-ironic-pxe:latest' - #DockerIronicPxeImage: 'tripleoupstream/centos-binary-ironic-pxe:latest' - #DockerIscsidConfigImage: 'tripleoupstream/centos-binary-iscsid:latest' - #DockerIscsidImage: 'tripleoupstream/centos-binary-iscsid:latest' - #DockerKeystoneConfigImage: 'tripleoupstream/centos-binary-keystone:latest' - #DockerKeystoneImage: 'tripleoupstream/centos-binary-keystone:latest' - #DockerManilaApiImage: 'tripleoupstream/centos-binary-manila-api:latest' - #DockerManilaConfigImage: 'tripleoupstream/centos-binary-manila-api:latest' - #DockerManilaSchedulerImage: 'tripleoupstream/centos-binary-manila-scheduler:latest' - #DockerMemcachedConfigImage: 'tripleoupstream/centos-binary-memcached:latest' - #DockerMemcachedImage: 'tripleoupstream/centos-binary-memcached:latest' - #DockerMistralApiImage: 'tripleoupstream/centos-binary-mistral-api:latest' - #DockerMistralConfigImage: 'tripleoupstream/centos-binary-mistral-api:latest' - #DockerMistralEngineImage: 'tripleoupstream/centos-binary-mistral-engine:latest' - #DockerMistralExecutorImage: 'tripleoupstream/centos-binary-mistral-executor:latest' - #DockerMongodbConfigImage: 'tripleoupstream/centos-binary-mongodb:latest' - #DockerMongodbImage: 'tripleoupstream/centos-binary-mongodb:latest' - #DockerMultipathdConfigImage: 'tripleoupstream/centos-binary-multipathd:latest' - #DockerMultipathdImage: 'tripleoupstream/centos-binary-multipathd:latest' - #DockerMysqlClientConfigImage: 'tripleoupstream/centos-binary-mariadb:latest' - #DockerMysqlConfigImage: 'tripleoupstream/centos-binary-mariadb:latest' - #DockerMysqlImage: 'tripleoupstream/centos-binary-mariadb:latest' - #DockerNeutronApiImage: 'tripleoupstream/centos-binary-neutron-server:latest' - #DockerNeutronConfigImage: 'tripleoupstream/centos-binary-neutron-server:latest' - #DockerNeutronDHCPImage: 'tripleoupstream/centos-binary-neutron-dhcp-agent:latest' - #DockerNeutronL3AgentImage: 'tripleoupstream/centos-binary-neutron-l3-agent:latest' - #DockerNeutronMetadataImage: 'tripleoupstream/centos-binary-neutron-metadata-agent:latest' - #DockerNovaApiImage: 'tripleoupstream/centos-binary-nova-api:latest' - #DockerNovaComputeImage: 'tripleoupstream/centos-binary-nova-compute:latest' - #DockerNovaComputeIronicImage: 'tripleoupstream/centos-binary-nova-compute-ironic:latest' - #DockerNovaConductorImage: 'tripleoupstream/centos-binary-nova-conductor:latest' - #DockerNovaConfigImage: 'tripleoupstream/centos-binary-nova-base:latest' - #DockerNovaConsoleauthImage: 'tripleoupstream/centos-binary-nova-consoleauth:latest' - #DockerNovaLibvirtConfigImage: 'tripleoupstream/centos-binary-nova-compute:latest' - #DockerNovaLibvirtImage: 'tripleoupstream/centos-binary-nova-libvirt:latest' - #DockerNovaPlacementConfigImage: 'tripleoupstream/centos-binary-nova-placement-api:latest' - #DockerNovaPlacementImage: 'tripleoupstream/centos-binary-nova-placement-api:latest' - #DockerNovaSchedulerImage: 'tripleoupstream/centos-binary-nova-scheduler:latest' - #DockerNovaVncProxyImage: 'tripleoupstream/centos-binary-nova-novncproxy:latest' - #DockerOctaviaApiImage: 'tripleoupstream/centos-binary-octavia-api:latest' - #DockerOctaviaConfigImage: 'tripleoupstream/centos-binary-octavia-api:latest' - #DockerOctaviaHealthManagerImage: 'tripleoupstream/centos-binary-octavia-health-manager:latest' - #DockerOctaviaHousekeepingImage: 'tripleoupstream/centos-binary-octavia-housekeeping:latest' - #DockerOctaviaWorkerImage: 'tripleoupstream/centos-binary-octavia-worker:latest' - #DockerOpenvswitchImage: 'tripleoupstream/centos-binary-neutron-openvswitch-agent:latest' - #DockerPankoApiImage: 'tripleoupstream/centos-binary-panko-api:latest' - #DockerPankoConfigImage: 'tripleoupstream/centos-binary-panko-api:latest' - #DockerRabbitmqConfigImage: 'tripleoupstream/centos-binary-rabbitmq:latest' - #DockerRabbitmqImage: 'tripleoupstream/centos-binary-rabbitmq:latest' - #DockerRedisConfigImage: 'tripleoupstream/centos-binary-redis:latest' - #DockerRedisImage: 'tripleoupstream/centos-binary-redis:latest' - #DockerSaharaApiImage: 'tripleoupstream/centos-binary-sahara-api:latest' - #DockerSaharaConfigImage: 'tripleoupstream/centos-binary-sahara-api:latest' - #DockerSaharaEngineImage: 'tripleoupstream/centos-binary-sahara-engine:latest' - #DockerSensuClientImage: 'tripleoupstream/centos-binary-sensu-client:latest' - #DockerSensuConfigImage: 'tripleoupstream/centos-binary-sensu-client:latest' - #DockerSwiftAccountImage: 'tripleoupstream/centos-binary-swift-account:latest' - #DockerSwiftConfigImage: 'tripleoupstream/centos-binary-swift-proxy-server:latest' - #DockerSwiftContainerImage: 'tripleoupstream/centos-binary-swift-container:latest' - #DockerSwiftObjectImage: 'tripleoupstream/centos-binary-swift-object:latest' - #DockerSwiftProxyImage: 'tripleoupstream/centos-binary-swift-proxy-server:latest' - #DockerTackerConfigImage: 'tripleoupstream/centos-binary-tacker:latest' - #DockerTackerImage: 'tripleoupstream/centos-binary-tacker:latest' - #DockerZaqarConfigImage: 'tripleoupstream/centos-binary-zaqar:latest' - #DockerZaqarImage: 'tripleoupstream/centos-binary-zaqar:latest' + DockerAodhApiImage: tripleoupstream/centos-binary-aodh-api:latest + DockerAodhConfigImage: tripleoupstream/centos-binary-aodh-api:latest + DockerAodhEvaluatorImage: tripleoupstream/centos-binary-aodh-evaluator:latest + DockerAodhListenerImage: tripleoupstream/centos-binary-aodh-listener:latest + DockerAodhNotifierImage: tripleoupstream/centos-binary-aodh-notifier:latest + DockerCeilometerCentralImage: tripleoupstream/centos-binary-ceilometer-central:latest + DockerCeilometerComputeImage: tripleoupstream/centos-binary-ceilometer-compute:latest + DockerCeilometerConfigImage: tripleoupstream/centos-binary-ceilometer-central:latest + DockerCeilometerIpmiImage: tripleoupstream/centos-binary-ceilometer-ipmi:latest + DockerCeilometerNotificationImage: tripleoupstream/centos-binary-ceilometer-notification:latest + DockerCinderApiImage: tripleoupstream/centos-binary-cinder-api:latest + DockerCinderBackupImage: tripleoupstream/centos-binary-cinder-backup:latest + DockerCinderConfigImage: tripleoupstream/centos-binary-cinder-api:latest + DockerCinderSchedulerImage: tripleoupstream/centos-binary-cinder-scheduler:latest + DockerCinderVolumeImage: tripleoupstream/centos-binary-cinder-volume:latest + DockerClustercheckConfigImage: tripleoupstream/centos-binary-mariadb:latest + DockerClustercheckImage: tripleoupstream/centos-binary-mariadb:latest + DockerCollectdConfigImage: tripleoupstream/centos-binary-collectd:latest + DockerCollectdImage: tripleoupstream/centos-binary-collectd:latest + DockerCongressApiImage: tripleoupstream/centos-binary-congress-api:latest + DockerCongressConfigImage: tripleoupstream/centos-binary-congress-api:latest + DockerEc2ApiConfigImage: tripleoupstream/centos-binary-ec2-api:latest + DockerEc2ApiImage: tripleoupstream/centos-binary-ec2-api:latest + DockerEtcdConfigImage: tripleoupstream/centos-binary-etcd:latest + DockerEtcdImage: tripleoupstream/centos-binary-etcd:latest + DockerGlanceApiConfigImage: tripleoupstream/centos-binary-glance-api:latest + DockerGlanceApiImage: tripleoupstream/centos-binary-glance-api:latest + DockerGnocchiApiImage: tripleoupstream/centos-binary-gnocchi-api:latest + DockerGnocchiConfigImage: tripleoupstream/centos-binary-gnocchi-api:latest + DockerGnocchiMetricdImage: tripleoupstream/centos-binary-gnocchi-metricd:latest + DockerGnocchiStatsdImage: tripleoupstream/centos-binary-gnocchi-statsd:latest + DockerHAProxyConfigImage: tripleoupstream/centos-binary-haproxy:latest + DockerHAProxyImage: tripleoupstream/centos-binary-haproxy:latest + DockerHeatApiCfnConfigImage: tripleoupstream/centos-binary-heat-api-cfn:latest + DockerHeatApiCfnImage: tripleoupstream/centos-binary-heat-api-cfn:latest + DockerHeatApiConfigImage: tripleoupstream/centos-binary-heat-api:latest + DockerHeatApiImage: tripleoupstream/centos-binary-heat-api:latest + DockerHeatConfigImage: tripleoupstream/centos-binary-heat-api:latest + DockerHeatEngineImage: tripleoupstream/centos-binary-heat-engine:latest + DockerHorizonConfigImage: tripleoupstream/centos-binary-horizon:latest + DockerHorizonImage: tripleoupstream/centos-binary-horizon:latest + DockerIronicApiImage: tripleoupstream/centos-binary-ironic-api:latest + DockerIronicApiConfigImage: tripleoupstream/centos-binary-ironic-api:latest + DockerIronicConductorImage: tripleoupstream/centos-binary-ironic-conductor:latest + DockerIronicConfigImage: tripleoupstream/centos-binary-ironic-pxe:latest + DockerIronicInspectorConfigImage: tripleoupstream/centos-binary-ironic-inspector:latest + DockerIronicInspectorImage: tripleoupstream/centos-binary-ironic-inspector:latest + DockerIronicPxeImage: tripleoupstream/centos-binary-ironic-pxe:latest + DockerIscsidConfigImage: tripleoupstream/centos-binary-iscsid:latest + DockerIscsidImage: tripleoupstream/centos-binary-iscsid:latest + DockerKeystoneConfigImage: tripleoupstream/centos-binary-keystone:latest + DockerKeystoneImage: tripleoupstream/centos-binary-keystone:latest + DockerManilaApiImage: tripleoupstream/centos-binary-manila-api:latest + DockerManilaConfigImage: tripleoupstream/centos-binary-manila-api:latest + DockerManilaSchedulerImage: tripleoupstream/centos-binary-manila-scheduler:latest + DockerMemcachedConfigImage: tripleoupstream/centos-binary-memcached:latest + DockerMemcachedImage: tripleoupstream/centos-binary-memcached:latest + DockerMistralApiImage: tripleoupstream/centos-binary-mistral-api:latest + DockerMistralConfigImage: tripleoupstream/centos-binary-mistral-api:latest + DockerMistralEngineImage: tripleoupstream/centos-binary-mistral-engine:latest + DockerMistralExecutorImage: tripleoupstream/centos-binary-mistral-executor:latest + DockerMongodbConfigImage: tripleoupstream/centos-binary-mongodb:latest + DockerMongodbImage: tripleoupstream/centos-binary-mongodb:latest + DockerMultipathdConfigImage: tripleoupstream/centos-binary-multipathd:latest + DockerMultipathdImage: tripleoupstream/centos-binary-multipathd:latest + DockerMysqlClientConfigImage: tripleoupstream/centos-binary-mariadb:latest + DockerMysqlConfigImage: tripleoupstream/centos-binary-mariadb:latest + DockerMysqlImage: tripleoupstream/centos-binary-mariadb:latest + DockerNeutronApiImage: tripleoupstream/centos-binary-neutron-server:latest + DockerNeutronConfigImage: tripleoupstream/centos-binary-neutron-server:latest + DockerNeutronDHCPImage: tripleoupstream/centos-binary-neutron-dhcp-agent:latest + DockerNeutronL3AgentImage: tripleoupstream/centos-binary-neutron-l3-agent:latest + DockerNeutronMetadataImage: tripleoupstream/centos-binary-neutron-metadata-agent:latest + DockerNovaApiImage: tripleoupstream/centos-binary-nova-api:latest + DockerNovaComputeImage: tripleoupstream/centos-binary-nova-compute:latest + DockerNovaComputeIronicImage: tripleoupstream/centos-binary-nova-compute-ironic:latest + DockerNovaConductorImage: tripleoupstream/centos-binary-nova-conductor:latest + DockerNovaConfigImage: tripleoupstream/centos-binary-nova-base:latest + DockerNovaConsoleauthImage: tripleoupstream/centos-binary-nova-consoleauth:latest + DockerNovaLibvirtConfigImage: tripleoupstream/centos-binary-nova-compute:latest + DockerNovaLibvirtImage: tripleoupstream/centos-binary-nova-libvirt:latest + DockerNovaPlacementConfigImage: tripleoupstream/centos-binary-nova-placement-api:latest + DockerNovaPlacementImage: tripleoupstream/centos-binary-nova-placement-api:latest + DockerNovaSchedulerImage: tripleoupstream/centos-binary-nova-scheduler:latest + DockerNovaVncProxyImage: tripleoupstream/centos-binary-nova-novncproxy:latest + DockerOVNControllerConfigImage: tripleoupstream/centos-binary-ovn-controller:latest + DockerOVNControllerImage: tripleoupstream/centos-binary-ovn-controller:latest + DockerOVNNbDbImage: tripleoupstream/centos-binary-ovn-nb-db-server:latest + DockerOVNNorthdImage: tripleoupstream/centos-binary-ovn-northd:latest + DockerOVNSbDbImage: tripleoupstream/centos-binary-ovn-sb-db-server:latest + DockerOctaviaApiImage: tripleoupstream/centos-binary-octavia-api:latest + DockerOctaviaConfigImage: tripleoupstream/centos-binary-octavia-api:latest + DockerOctaviaHealthManagerImage: tripleoupstream/centos-binary-octavia-health-manager:latest + DockerOctaviaHousekeepingImage: tripleoupstream/centos-binary-octavia-housekeeping:latest + DockerOctaviaWorkerImage: tripleoupstream/centos-binary-octavia-worker:latest + DockerOpenvswitchImage: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest + DockerPankoApiImage: tripleoupstream/centos-binary-panko-api:latest + DockerPankoConfigImage: tripleoupstream/centos-binary-panko-api:latest + DockerRabbitmqConfigImage: tripleoupstream/centos-binary-rabbitmq:latest + DockerRabbitmqImage: tripleoupstream/centos-binary-rabbitmq:latest + DockerRedisConfigImage: tripleoupstream/centos-binary-redis:latest + DockerRedisImage: tripleoupstream/centos-binary-redis:latest + DockerSaharaApiImage: tripleoupstream/centos-binary-sahara-api:latest + DockerSaharaConfigImage: tripleoupstream/centos-binary-sahara-api:latest + DockerSaharaEngineImage: tripleoupstream/centos-binary-sahara-engine:latest + DockerSensuClientImage: tripleoupstream/centos-binary-sensu-client:latest + DockerSensuConfigImage: tripleoupstream/centos-binary-sensu-client:latest + DockerSwiftAccountImage: tripleoupstream/centos-binary-swift-account:latest + DockerSwiftConfigImage: tripleoupstream/centos-binary-swift-proxy-server:latest + DockerSwiftContainerImage: tripleoupstream/centos-binary-swift-container:latest + DockerSwiftObjectImage: tripleoupstream/centos-binary-swift-object:latest + DockerSwiftProxyImage: tripleoupstream/centos-binary-swift-proxy-server:latest + DockerTackerConfigImage: tripleoupstream/centos-binary-tacker:latest + DockerTackerImage: tripleoupstream/centos-binary-tacker:latest + DockerZaqarConfigImage: tripleoupstream/centos-binary-zaqar:latest + DockerZaqarImage: tripleoupstream/centos-binary-zaqar:latest diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml index 3ca04697..8d304494 100644 --- a/environments/docker-services-tls-everywhere.yaml +++ b/environments/docker-services-tls-everywhere.yaml @@ -34,18 +34,3 @@ resource_registry: OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml - -parameter_defaults: - # To specify a local docker registry, enable these - # where 192.168.24.1 is the host running docker-distribution - #DockerNamespace: 192.168.24.1:8787/tripleoupstream - #DockerNamespaceIsRegistry: true - - ComputeServices: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::CertmongerUser - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - - OS::TripleO::Services::Sshd diff --git a/environments/docker.yaml b/environments/docker.yaml index c32001a7..52b2dc05 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -63,18 +63,3 @@ resource_registry: OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml - -parameter_defaults: - # To specify a local docker registry, enable these - # where 192.168.24.1 is the host running docker-distribution - #DockerNamespace: 192.168.24.1:8787/tripleoupstream - #DockerNamespaceIsRegistry: true - - ComputeServices: - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::Docker - - OS::TripleO::Services::CeilometerAgentCompute - - OS::TripleO::Services::Sshd - - OS::TripleO::Services::OpenDaylightOvs diff --git a/environments/neutron-ml2-bigswitch.yaml b/environments/neutron-ml2-bigswitch.yaml index 8a4a144c..c0ba906e 100644 --- a/environments/neutron-ml2-bigswitch.yaml +++ b/environments/neutron-ml2-bigswitch.yaml @@ -13,7 +13,6 @@ parameter_defaults: NeutronBigswitchRestproxyServerAuth: NeutronMechanismDrivers: openvswitch,bsn_ml2 NeutronServicePlugins: bsn_l3,bsn_service_plugin - KeystoneNotificationDriver: messaging # Optional: # NeutronBigswitchRestproxyAutoSyncOnFailure: diff --git a/environments/overcloud-baremetal.j2.yaml b/environments/overcloud-baremetal.j2.yaml index 668e28de..8d7bc8d9 100644 --- a/environments/overcloud-baremetal.j2.yaml +++ b/environments/overcloud-baremetal.j2.yaml @@ -4,6 +4,7 @@ resource_registry: OS::TripleO::DefaultPasswords: OS::Heat::None OS::TripleO::RandomString: OS::Heat::None OS::TripleO::AllNodesDeployment: OS::Heat::None + OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml parameter_defaults: # Deploy no services diff --git a/environments/overcloud-services.yaml b/environments/overcloud-services.yaml index c409b899..1d01cb3c 100644 --- a/environments/overcloud-services.yaml +++ b/environments/overcloud-services.yaml @@ -1,3 +1,6 @@ +resource_registry: + OS::TripleO::DeployedServerEnvironment: ../deployed-server/deployed-server-environment-output.yaml + parameter_defaults: # Consistent Hostname format ControllerDeployedServerHostnameFormat: overcloud-controller-%index% diff --git a/environments/services-docker/congress.yaml b/environments/services-docker/congress.yaml index 5d4c7307..e1edd352 100644 --- a/environments/services-docker/congress.yaml +++ b/environments/services-docker/congress.yaml @@ -1,2 +1,2 @@ resource_registry: - OS::TripleO::Services::Congress: ../../docker/services/congress-api.yaml + OS::TripleO::Services::Congress: ../../docker/services/congress.yaml diff --git a/environments/services-docker/manila.yaml b/environments/services-docker/manila.yaml index 795309f6..eacdb1a1 100644 --- a/environments/services-docker/manila.yaml +++ b/environments/services-docker/manila.yaml @@ -1,3 +1,4 @@ resource_registry: OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml + OS::TripleO::Services::ManilaShare: ../../docker/services/manila-share.yaml diff --git a/environments/services/neutron-lbaasv2.yaml b/environments/services/neutron-lbaasv2.yaml new file mode 100644 index 00000000..385bb2fe --- /dev/null +++ b/environments/services/neutron-lbaasv2.yaml @@ -0,0 +1,18 @@ +# A Heat environment file that can be used to deploy Neutron LBaaSv2 service +# +# Currently there are only two interface drivers for Neutron LBaaSv2 +# The default option is the standard OVS driver the other option is to be used +# when linux bridges are used instead of OVS +# In order to enable other backend, replace the content of NeutronLbaasInterfaceDriver +# +# - OVS: neutron.agent.linux.interface.OVSInterfaceDriver +# - LinuxBridges: neutron.agent.linux.interface.BridgeInterfaceDriver +resource_registry: + OS::TripleO::Services::NeutronLbaasv2Agent: ../puppet/services/neutron-lbaas.yaml + +parameter_defaults: + NeutronLbaasInterfaceDriver: "neutron.agent.linux.interface.OVSInterfaceDriver" + NeutronLbaasDeviceDriver: "neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver" + NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default'] + NeutronServicePlugins: "qos,router,trunk,lbaasv2" + |