X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=build%2Fcsit-environment.yaml;h=fdceb0c1c67491ae491ab0ae6b41c0f3e35098e8;hb=48d1c6885afe72c92d07204cdfc97829ce9d24ed;hp=4ef550108f50e4e39e440ddb3e365d1507cc3354;hpb=ead4552c3344308b9620911c76a917de868ed2cb;p=apex.git

diff --git a/build/csit-environment.yaml b/build/csit-environment.yaml
index 4ef55010..fdceb0c1 100644
--- a/build/csit-environment.yaml
+++ b/build/csit-environment.yaml
@@ -1,8 +1,9 @@
-#Environment file used to list common parameters required for all deployment
-#types
+---
+# Environment file used to list common parameters required for all deployment
+# types
 
 parameters:
-#  CloudDomain:
+  CloudDomain: opnfvlf.org
 
 parameter_defaults:
   GlanceBackend: file
@@ -10,29 +11,36 @@ parameter_defaults:
   NeutronEnableForceMetadata: true
   NeutronEnableDHCPMetadata: true
   NeutronEnableIsolatedMetadata: true
-  OvercloudControlFlavor: control
-  OvercloudComputeFlavor: compute
-  controllerImage: overcloud-full
   ExtraConfig:
-    tripleo::ringbuilder::build_ring: False
-    nova::nova_public_key:
-      type: 'ssh-rsa'
-      replace_public_key:
-    nova::nova_private_key:
-      type: 'ssh-rsa'
-      replace_private_key:
-    nova::policy::policies:
-      nova-os_compute_api:servers:show:host_status:
-        key: 'os_compute_api:servers:show:host_status'
-        value: 'rule:admin_or_owner'
+    tripleo::ringbuilder::build_ring: false
+    nova::api::default_floating_pool: 'external'
+  DockerPuppetProcessCount: 10
+  NeutronNetworkVLANRanges: 'datacentre:500:525'
+  SshServerOptions:
+    HostKey:
+      - '/etc/ssh/ssh_host_rsa_key'
+      - '/etc/ssh/ssh_host_ecdsa_key'
+      - '/etc/ssh/ssh_host_ed25519_key'
+    SyslogFacility: 'AUTHPRIV'
+    AuthorizedKeysFile: '.ssh/authorized_keys'
+    PasswordAuthentication: 'no'
+    ChallengeResponseAuthentication: 'no'
+    GSSAPIAuthentication: 'no'
+    GSSAPICleanupCredentials: 'no'
+    UsePAM: 'yes'
+    X11Forwarding: 'yes'
+    UsePrivilegeSeparation: 'sandbox'
+    AcceptEnv:
+      - 'LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES'
+      - 'LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT'
+      - 'LC_IDENTIFICATION LC_ALL LANGUAGE'
+      - 'XMODIFIERS'
+    Subsystem: 'sftp  /usr/libexec/openssh/sftp-server'
+    UseDNS: 'no'
   ControllerServices:
     - OS::TripleO::Services::CACerts
-    - OS::TripleO::Services::CinderApi
-    - OS::TripleO::Services::CinderBackup
-    - OS::TripleO::Services::CinderScheduler
-    - OS::TripleO::Services::CinderVolume
-    - OS::TripleO::Services::Core
     - OS::TripleO::Services::Kernel
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::Keystone
     - OS::TripleO::Services::GlanceApi
     - OS::TripleO::Services::GlanceRegistry
@@ -41,11 +49,9 @@ parameter_defaults:
     - OS::TripleO::Services::NeutronMetadataAgent
     - OS::TripleO::Services::NeutronApi
     - OS::TripleO::Services::NeutronCorePlugin
-    - OS::TripleO::Services::RabbitMQ
     - OS::TripleO::Services::HAproxy
     - OS::TripleO::Services::Keepalived
     - OS::TripleO::Services::Memcached
-    - OS::TripleO::Services::Pacemaker
     - OS::TripleO::Services::Redis
     - OS::TripleO::Services::NovaConductor
     - OS::TripleO::Services::MongoDb
@@ -55,26 +61,30 @@ parameter_defaults:
     - OS::TripleO::Services::NovaConsoleauth
     - OS::TripleO::Services::NovaVncProxy
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::OsloMessagingRpc
+    - OS::TripleO::Services::OsloMessagingNotify
+    - OS::TripleO::Services::Pacemaker
     - OS::TripleO::Services::Snmp
+    - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timezone
-    - OS::TripleO::Services::Horizon
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::OpenDaylightApi
     - OS::TripleO::Services::OpenDaylightOvs
-    - OS::TripleO::Services::VipHosts
   ComputeServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::Ntp
     - OS::TripleO::Services::Snmp
+    - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::NovaCompute
     - OS::TripleO::Services::NovaLibvirt
     - OS::TripleO::Services::Kernel
+    - OS::TripleO::Services::Docker
     - OS::TripleO::Services::ComputeNeutronCorePlugin
     - OS::TripleO::Services::ComputeNeutronMetadataAgent
+    - OS::TripleO::Services::NovaPlacement
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::NeutronSriovAgent
     - OS::TripleO::Services::OpenDaylightOvs
-    - OS::TripleO::Services::VipHosts