vagrant-openshift 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4863ea5fa2533091ea88ff8c594c145177acf841
-  data.tar.gz: b695616624ee67a2787520e8eddfe0ce0babd5a5
+  metadata.gz: 220b9c14ff732b5818c03c93531e3f2fe0768f3e
+  data.tar.gz: c7dc50c408ce41605578178e0388921586f9e148
 SHA512:
-  metadata.gz: f8a8eee284d4516b34687914d0a42a3377fa8ce784fff1fe5a5a334fc51d3b824d19044d6efb0deedc212254ad0245572bde50a5072a2fb62abd84ce1a9cb908
-  data.tar.gz: 8e283dd6c6cfd007b19fa28c55c67947b085b7b8e0a91acf20c15175f4bc10e03b40394ed5b9cb15129d2b84d449c650317d36d7503ad1cd71956722c47d1a2b
+  metadata.gz: 42a5eb304cbf47c317205d0042c1712b4eaceaa948ccf6afe21ef46888909381442151aadbb4e2f98d32cc83a1e72000a10b0de2143daa50674f3797f8af3781
+  data.tar.gz: 9724c0c61c468573e061571bda546eee8284db2269283a1d4407a9dc9e26be3fb46e5eac30bd4f2b378d582e71aa1ed85d60966326ac83ed9f2e0dadaf2c8575

data/README.asciidoc

@@ -88,7 +88,7 @@ you may modify later to match your vagrant requirements:
 
 [source, sh]
 ----
-$ vagrant origin-init --stage inst --os fedora <instance name>
+$ vagrant origin-init --stage inst --os (fedora|centos7|rhel7) <instance name>
 ----
 
 ==== Start the machine
@@ -97,9 +97,11 @@ $ vagrant origin-init --stage inst --os fedora <instance name>
 
 Running with the default VirtualBox provider:
 
+NOTE: If you are trying to refresh an existing image, you'll want to remove the current image with `vagrant box list` and `vagrant box remove <box_name>`
+
 [source, sh]
 ----
-vagrant up
+$ vagrant up
 ----
 
 NOTE: See link:#other-providers[Other Providers] below for launching VMs from other providers.
@@ -177,7 +179,7 @@ AWSPrivateKeyPath=<SSH Private key>
 
 [source, sh]
 ----
-$ vagrant origin-init --stage inst --os fedora <instance name>
+$ vagrant origin-init --stage inst --os (fedora|centos7|rhel7) <instance name>
 ----
 
 The instance name will be applied as a tag and should generally be

data/lib/vagrant-openshift/action/install_openshift3.rb

@@ -29,6 +29,14 @@ module Vagrant
           sudo(env[:machine], %{
 set -x
 
+#systemctl enable firewalld
+#systemctl start firewalld
+#firewall-cmd --permanent --zone=public --add-port=8443/tcp
+#firewall-cmd --permanent --zone=public --add-port=8444/tcp
+#firewall-cmd --reload
+#firewall-cmd --list-all
+
+
 ORIGIN_PATH=/data/src/github.com/openshift/origin
 cat > /etc/profile.d/openshift.sh <<DELIM
 export GOPATH=/data
@@ -42,6 +50,20 @@ pushd $ORIGIN_PATH
   hack/install-etcd.sh
 popd
 
+HOST=`facter ec2_public_hostname 2>/dev/null | xargs echo -n`
+if [ -z "$HOST" ]
+then
+  HOST=`ip -f inet addr show | grep -Po 'inet \K[\d.]+' | grep 10.245 | head -1`
+  if [ -z "$HOST" ]
+  then
+    HOST=`ip -f inet addr show | grep -Po 'inet \K[\d.]+' | grep 10. | head -1`
+    if [ -z "$HOST" ]
+    then
+      HOST=localhost
+    fi
+  fi
+fi
+
 cat > /usr/lib/systemd/system/openshift.service <<DELIM
 [Unit]
 Description=OpenShift
@@ -52,7 +74,7 @@ Documentation=https://github.com/openshift/origin
 [Service]
 Type=simple
 EnvironmentFile=-/etc/profile.d/openshift.sh
-ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --listen=http://0.0.0.0:8080
+ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --public-master=https://${HOST}:8443
 
 [Install]
 WantedBy=multi-user.target

data/lib/vagrant-openshift/action/install_openshift3_rhel7.rb

@@ -0,0 +1,72 @@
+#--
+# Copyright 2013 Red Hat, Inc.
+#
+# Licensed 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.
+#++
+
+module Vagrant
+  module Openshift
+    module Action
+      class InstallOpenshift3Rhel7
+        include CommandHelper
+        def initialize(app, env)
+          @app = app
+          @env = env
+        end
+
+        def call(env)
+          is_fedora = env[:machine].communicate.test("test -e /etc/fedora-release")
+          is_centos = env[:machine].communicate.test("test -e /etc/centos-release")
+          is_rhel   = env[:machine].communicate.test("test -e /etc/redhat-release") && !is_centos && !is_fedora
+          if is_rhel
+            ssh_user = env[:machine].ssh_info[:username]
+            sudo(env[:machine], %{
+set -x
+
+# inside temporary directory create docker build context for the new base image
+contextdir=$(mktemp -d)
+
+# copy the necessary files
+mkdir $contextdir/{certs,repos,vars}
+cp /var/lib/yum/*.pem $contextdir/certs
+cp /etc/yum/vars/* $contextdir/vars
+cp /etc/yum.repos.d/* $contextdir/repos
+
+# create Dockerfile
+cat <<EOF > $contextdir/Dockerfile
+FROM rhel7:latest
+
+RUN yum remove -y subscription-manager
+
+ADD vars/* /etc/yum/vars/
+ADD repos/* /etc/yum.repos.d/
+ADD certs/* /var/lib/yum/
+
+RUN yum update -y && yum clean all
+
+EOF
+
+# make old official image backup and build the new "official"
+docker tag rhel7:latest rhel7:latest_official
+docker build --rm -t rhel7:latest $contextdir
+
+# cleaning
+rm -rf $contextdir
+            })
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-openshift/action.rb

@@ -35,6 +35,7 @@ module Vagrant
           b.use YumUpdate
           b.use SetHostName
           b.use InstallOpenshift3
+          b.use InstallOpenshift3Rhel7
           b.use InstallOpenshift3AssetDependencies
         end
       end
@@ -202,6 +203,7 @@ module Vagrant
       autoload :BuildOpenshift3BaseImages, action_root.join("build_openshift3_base_images")
       autoload :PushOpenshift3Release, action_root.join("push_openshift3_release")
       autoload :InstallOpenshift3, action_root.join("install_openshift3")
+      autoload :InstallOpenshift3Rhel7, action_root.join("install_openshift3_rhel7")
       autoload :BuildOpenshift3, action_root.join("build_openshift3")
       autoload :BuildSti, action_root.join("build_sti")
       autoload :TryRestartOpenshift3, action_root.join("try_restart_openshift3")

data/lib/vagrant-openshift/version.rb

@@ -16,6 +16,6 @@
 
 module Vagrant
   module Openshift
-    VERSION = "1.0.14"
+    VERSION = "1.0.15"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openshift
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Red Hat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -139,6 +139,7 @@ files:
 - lib/vagrant-openshift/action/install_openshift3_asset_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb
 - lib/vagrant-openshift/action/install_openshift3_images.rb
+- lib/vagrant-openshift/action/install_openshift3_rhel7.rb
 - lib/vagrant-openshift/action/local_openshift3_checkout.rb
 - lib/vagrant-openshift/action/modify_ami.rb
 - lib/vagrant-openshift/action/modify_instance.rb