X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fopnfv-environment.yaml;h=c94ba312763a9c21a98e02dc7105b643cedb67ac;hb=04ab18a5557529efc29da69b676754ee1dcdf5d3;hp=8140d0d7ea6a6a74fd5f2a1325248ea2ece456b7;hpb=9fccd16b2998007022eb360cf06262f803ea84a4;p=apex.git

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 8140d0d7..c94ba312 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -3,7 +3,6 @@
 # types
 
 parameters:
-  # # value updated via lib/overcloud-deploy-functions.sh
   # CloudDomain:
 
 parameter_defaults:
@@ -11,7 +10,11 @@ parameter_defaults:
   NeutronEnableForceMetadata: true
   NeutronEnableDHCPMetadata: true
   NeutronEnableIsolatedMetadata: true
-  NeutronPluginExtensions: 'qos,port_security,data_plane_status'
+  # NeutronDhcpAgentsPerNetwork: 3
+  NeutronPluginExtensions: 'qos,port_security,neutron.plugins.ml2.extensions.\
+                            data_plane_status:DataPlaneStatusExtensionDriver'
+  # TODO: VLAN Ranges should be configurable from network settings
+  NeutronNetworkVLANRanges: 'datacentre:500:525'
   # NeutronVPPAgentPhysnets:
   # NovaSchedulerDefaultFilters:
   # # Kernel arguments, this value will be set to kernel arguments specified
@@ -23,14 +26,32 @@ parameter_defaults:
   # NeutronDpdkMemoryChannels:
   # ControllerExtraConfig:
   # NovaComputeExtraConfig:
+  MigrationSshKey:
+    public_key: replace_public_key
+    private_key: replace_private_key
+  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'
   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'
@@ -47,6 +68,7 @@ parameter_defaults:
     # value updated via lib/overcloud-deploy-functions.sh
     # opendaylight::vpp_routing_node: overcloud-novacompute-0.opnfvlf.org
   ControllerServices:
+    - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephMon
     - OS::TripleO::Services::CephOSD
@@ -117,19 +139,21 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::OpenDaylightApi
     - OS::TripleO::Services::OpenDaylightOvs
-#    - OS::TripleO::Services::ONOSApi
-#    - OS::TripleO::Services::ONOSOvs
+    # - OS::TripleO::Services::ONOSApi
+    # - OS::TripleO::Services::ONOSOvs
     - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::Etcd
-#    - OS::TripleO::Services::Gluon
+    # - OS::TripleO::Services::Gluon
     - OS::TripleO::Services::Tacker
     - OS::TripleO::Services::NeutronHoneycombAgent
     - OS::TripleO::Services::Congress
     - OS::TripleO::Services::NeutronVppAgent
     - OS::TripleO::Services::OVNDBs
     - OS::TripleO::Services::Vpp
+    - OS::TripleO::Services::NeutronBgpVpnApi
   ComputeServices:
+    - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Barometer
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephClient
@@ -150,7 +174,7 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::NeutronSriovAgent
     - OS::TripleO::Services::OpenDaylightOvs
-#    - OS::TripleO::Services::ONOSOvs
+    # - OS::TripleO::Services::ONOSOvs
     - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::NeutronHoneycombAgent