FD3-507 fix conflictos merge

bin/composer-install.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+chmod 0400 keys/*
+eval $(ssh-agent)
+ssh-add keys/bitbucket.id_rsa
+composer install --no-progress -n
+
+kill $SSH_AGENT_PID
+unset SSH_AGENT_PID

src/CablemodemBundle/Command/DHCPHostCRUDCommand.php

@@ -17,6 +17,10 @@ class DHCPHostCRUDCommand extends ContainerAwareCommand
      */
     protected function configure()
     {
+        $params = [
+            'CMD_USERNAME' => getenv("CMD_USERNAME") ? getenv("CMD_USERNAME") : 'admin',
+            'CMD_PASSWORD' => getenv("CMD_PASSWORD") ? getenv("CMD_PASSWORD") : 'adminpass'
+        ];
         $this
             ->setName('dhcp:host:crud')
             ->setDescription('DHCP Host CRUD')
@@ -28,8 +32,8 @@ class DHCPHostCRUDCommand extends ContainerAwareCommand
                 new InputOption('url-put', null, InputOption::VALUE_OPTIONAL, 'API URL PUT hosts', 'http://dhcp:8000/api/hosts/{id}.json'),
                 new InputOption('url-delete', null, InputOption::VALUE_OPTIONAL, 'API URL DELETE hosts', 'http://dhcp:8000/api/hosts/{id}.json'),
                 new InputOption('url-get-hosttype', null, InputOption::VALUE_OPTIONAL, 'API URL GET hosts types', 'http://dhcp:8000/api/hosttypes.json'),
-                new InputOption('api-username', null, InputOption::VALUE_OPTIONAL, 'API username', 'admin'),
-                new InputOption('api-password', null, InputOption::VALUE_OPTIONAL, 'API password', 'adminpass'),
+                new InputOption('api-username', null, InputOption::VALUE_OPTIONAL, 'API username', $params["CMD_USERNAME"]),
+                new InputOption('api-password', null, InputOption::VALUE_OPTIONAL, 'API password', $params["CMD_PASSWORD"]),
             ))
             ->setHelp(<<<EOT
 The <info>dhcp:host:crud</info> command create or delete a DHCP Host from Cablemodem HostType and mac parameter