Repository: metron
Updated Branches:
  refs/heads/master b48ab93c6 -> 9b4b40278


METRON-1452 Rebase Dev Environment on Latest CentOS 6 (nickwallen) closes 
apache/metron#933


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/9b4b4027
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/9b4b4027
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/9b4b4027

Branch: refs/heads/master
Commit: 9b4b40278086b881803a8c82e7eebb47d83847f7
Parents: b48ab93
Author: nickwallen <n...@nickallen.org>
Authored: Tue Mar 6 07:29:33 2018 -0500
Committer: nickallen <nickal...@apache.org>
Committed: Tue Mar 6 07:29:33 2018 -0500

----------------------------------------------------------------------
 .../development/centos6/Vagrantfile             | 11 +++++-----
 .../development/centos6/ansible/playbook.yml    | 23 ++++++++++++++++++++
 .../development/ubuntu14/Vagrantfile            |  5 +++--
 3 files changed, 32 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/9b4b4027/metron-deployment/development/centos6/Vagrantfile
----------------------------------------------------------------------
diff --git a/metron-deployment/development/centos6/Vagrantfile 
b/metron-deployment/development/centos6/Vagrantfile
index ed74b76..101a2dd 100644
--- a/metron-deployment/development/centos6/Vagrantfile
+++ b/metron-deployment/development/centos6/Vagrantfile
@@ -25,7 +25,7 @@ begin
      [ '--ansible-skip-tags', GetoptLong::OPTIONAL_ARGUMENT ]
    )
 
-   opts.quiet = TRUE
+   opts.quiet = true
 
    opts.each do |opt, arg|
      case opt
@@ -52,8 +52,8 @@ hosts = [{
 
 Vagrant.configure(2) do |config|
 
-  # all hosts built on centos 6
-  config.vm.box = "metron/centos_base"
+  # host built on centos 6
+  config.vm.box = "centos/6"
   config.ssh.insert_key = true
 
   # enable the hostmanager plugin
@@ -83,10 +83,11 @@ Vagrant.configure(2) do |config|
 
   # provision the host with ansible
   config.vm.provision :ansible do |ansible|
-    ansible.playbook = "../../ansible/playbooks/metron_full_install.yml"
-    ansible.sudo = true
+    ansible.playbook = "ansible/playbook.yml"
+    ansible.become = true
     ansible.tags = ansibleTags.split(",") if ansibleTags != ''
     ansible.skip_tags = ansibleSkipTags.split(",") if ansibleSkipTags != ''
     ansible.inventory_path = "ansible/inventory"
+    ansible.compatibility_mode = "1.8"
   end
 end

http://git-wip-us.apache.org/repos/asf/metron/blob/9b4b4027/metron-deployment/development/centos6/ansible/playbook.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/development/centos6/ansible/playbook.yml 
b/metron-deployment/development/centos6/ansible/playbook.yml
new file mode 100644
index 0000000..fa14677
--- /dev/null
+++ b/metron-deployment/development/centos6/ansible/playbook.yml
@@ -0,0 +1,23 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+---
+- hosts: all
+  roles:
+    - role: libselinux-python
+    - role: enable-swap
+
+- include: ../../../ansible/playbooks/metron_full_install.yml

http://git-wip-us.apache.org/repos/asf/metron/blob/9b4b4027/metron-deployment/development/ubuntu14/Vagrantfile
----------------------------------------------------------------------
diff --git a/metron-deployment/development/ubuntu14/Vagrantfile 
b/metron-deployment/development/ubuntu14/Vagrantfile
index 55f0aea..01c0d17 100644
--- a/metron-deployment/development/ubuntu14/Vagrantfile
+++ b/metron-deployment/development/ubuntu14/Vagrantfile
@@ -25,7 +25,7 @@ begin
      [ '--ansible-skip-tags', GetoptLong::OPTIONAL_ARGUMENT ]
    )
 
-   opts.quiet = TRUE
+   opts.quiet = true
 
    opts.each do |opt, arg|
      case opt
@@ -79,9 +79,10 @@ Vagrant.configure(2) do |config|
   # provision the host with ansible
   config.vm.provision :ansible do |ansible|
     ansible.playbook = "ansible/playbook.yml"
-    ansible.sudo = true
+    ansible.become = true
     ansible.tags = ansibleTags.split(",") if ansibleTags != ''
     ansible.skip_tags = ansibleSkipTags.split(",") if ansibleSkipTags != ''
     ansible.inventory_path = "ansible/inventory"
+    ansible.compatibility_mode = "1.8"
   end
 end

Reply via email to