Merge "Remove LXC references from manifests and dockerctl"

deployment/puppet/docker/manifests/init.pp

@@ -9,7 +9,7 @@ $docker_engine = "native",
 $dependent_dirs = ["/var/log/docker-logs", "/var/log/docker-logs/remote",
   "/var/log/docker-logs/audit", "/var/log/docker-logs/cobbler",
   "/var/log/docker-logs/ConsoleKit", "/var/log/docker-logs/coredump",
-  "/var/log/docker-logs/httpd", "/var/log/docker-logs/lxc",
+  "/var/log/docker-logs/httpd",
   "/var/log/docker-logs/nailgun", "/var/log/docker-logs/naily",
   "/var/log/docker-logs/nginx", "/var/log/docker-logs/ntpstats",
   "/var/log/docker-logs/puppet", "/var/log/docker-logs/rabbitmq",
@@ -22,10 +22,6 @@ $dependent_dirs = ["/var/log/docker-logs", "/var/log/docker-logs/remote",
   ]
 ) {
 
-  package { "lxc":
-    ensure => installed,
-  }
-
   package {$docker_package:
     ensure => $package_ensure,
   }

deployment/puppet/docker/spec/classes/docker_spec.rb

@@ -24,7 +24,7 @@ describe 'docker' do
           :dependent_dirs => ["/var/log/docker-logs", "/var/log/docker-logs/remote",
               "/var/log/docker-logs/audit", "/var/log/docker-logs/cobbler",
               "/var/log/docker-logs/ConsoleKit", "/var/log/docker-logs/coredump",
-              "/var/log/docker-logs/httpd", "/var/log/docker-logs/lxc",
+              "/var/log/docker-logs/httpd",
               "/var/log/docker-logs/nailgun", "/var/log/docker-logs/naily",
               "/var/log/docker-logs/nginx", "/var/log/docker-logs/ntpstats",
               "/var/log/docker-logs/puppet", "/var/log/docker-logs/rabbitmq",
@@ -40,7 +40,6 @@ describe 'docker' do
 
       it 'configures with the valid params' do
         should contain_class('docker')
-        should contain_package('lxc').with_ensure('installed')
         should contain_package(params[:docker_package]).with_ensure(params[:package_ensure])
         should contain_service(params[:docker_service]).with(
           :enable => true,

deployment/puppet/openstack/templates/10-fuel-docker.conf.erb

@@ -26,7 +26,6 @@
 "/var/log/fuelmenu.log"
 "/var/log/httpd/*"
 "/var/log/kern.log"
-"/var/log/lxc/*.log"
 "/var/log/mail.log"
 "/var/log/nailgun-agent.log"
 "/var/log/nailgun/*.log"

files/fuel-docker-utils/functions.sh

@@ -287,11 +287,7 @@ function attach_container {
 }
 
 function shell_container {
-  case $EXEC_DRIVER in
-    lxc)  lxc_shell_container "$@"
-          ;;
-    *)    exec_shell_container "$@"
-  esac
+  exec_shell_container "$@"
 }
 
 function exec_shell_container {
@@ -326,21 +322,6 @@ function exec_shell_container {
   docker exec $exec_opts $id $prefix "${command[@]}"
 }
 
-function lxc_shell_container {
-  id=$(get_container_id "$1")
-  if [ $? -ne 0 ]; then
-    echo "Could not get docker ID for $container. Is it running?" 1>&2
-    return 1
-  fi
-  if [ -z "$2" ]; then
-    command="/bin/bash"
-  else
-    shift
-    command=("$@")
-  fi
-  lxc-attach --name "$id" -- "${command[@]}"
-}
-
 function stop_container {
   lock
   if [ "$1" = "all" ]; then