Fixes acquia#1891: Config split ignored during config-import on Acqui…

…a cloud.

config/build.yml

@@ -45,17 +45,10 @@ cm:
     # The default config key to use for imports. This is the key used in Drupal's global $config_directories variable.
     # E.g., $config_directories['sync']. It must have a corresponding key in cm.core.dirs. E.g., `cm.core.dirs.sync`.
     key: sync
-    # A different config key is used by the deploy:update step, which is executed on Acquia Cloud.
-    # This must also have a corresponding value at cm.core.dirs.vcs.
-    # If you are NOT on Acquia hosting, you probably need to change this to 'sync'.
-    # @see https://github.com/acquia/blt/issues/678
-    deploy-key: vcs
     dirs:
       # Corresponding value is defined in config.settings.php.
       sync:
         path: ${cm.core.path}/default
-      vcs:
-        path: ${cm.core.dirs.sync.path}
   features:
     no-overrides: true
 

src/Robo/Commands/Deploy/DeployCommand.php

@@ -552,15 +552,6 @@ protected function deploySamlConfig() {
    * @command deploy:update
    */
   public function updateSites() {
-    // Most sites store their version-controlled configuration in
-    // /config/default. ACE internally sets the vcs configuration
-    // directory to /config/default, so we use that.
-    // @see https://github.com/acquia/blt/issues/678
-    if (!isset($_ENV['AH_SITE_ENVIRONMENT']) && $this->getConfigValue('cm.core.deploy-key') == 'vcs') {
-      $this->logger->warning('cm.core.deploy-key is set to "vcs". This will only work on Acquia Cloud. If you are not using Acquia Cloud, change this configuration value.');
-    }
-    $this->config->set('cm.core.key', $this->getConfigValue('cm.core.deploy-key'));
-
     // Disable alias since we are targeting specific uri.
     $this->config->set('drush.alias', '');