vagrant-openshift 1.0.15 → 1.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/vagrant-openshift/action/install_openshift3.rb +16 -7
  3. data/lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb +4 -1
  4. data/lib/vagrant-openshift/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 220b9c14ff732b5818c03c93531e3f2fe0768f3e
4
- data.tar.gz: c7dc50c408ce41605578178e0388921586f9e148
3
+ metadata.gz: f49aa5ef36f1c4daa4d0dfe7139d8e7ac625e952
4
+ data.tar.gz: 49228d9fd1d4e834f019adb7f1d1edc65e3847b5
5
5
  SHA512:
6
- metadata.gz: 42a5eb304cbf47c317205d0042c1712b4eaceaa948ccf6afe21ef46888909381442151aadbb4e2f98d32cc83a1e72000a10b0de2143daa50674f3797f8af3781
7
- data.tar.gz: 9724c0c61c468573e061571bda546eee8284db2269283a1d4407a9dc9e26be3fb46e5eac30bd4f2b378d582e71aa1ed85d60966326ac83ed9f2e0dadaf2c8575
6
+ metadata.gz: d6f8a216f7644c5d521581489ead8c6902378881d3e3fb451aae8c09ba03f8106388945e27b8fa038f51f8d99e8006db0f1cce141c59a49dad06142c75da8748
7
+ data.tar.gz: f6d018a36a95578b4cb4079062a4dfd26ca3ebb78011291994860c6e62b570e9084582e68bb10242f63f4718d886f7656497f984cc3b4a168ee4d4d498072fb5
data/lib/vagrant-openshift/action/install_openshift3.rb CHANGED
@@ -50,20 +50,24 @@ pushd $ORIGIN_PATH
50
50
  hack/install-etcd.sh
51
51
  popd
52
52
 
53
- HOST=`facter ec2_public_hostname 2>/dev/null | xargs echo -n`
54
- if [ -z "$HOST" ]
53
+ cat > /usr/bin/generate_openshift_service <<OUTERDELIM
54
+
55
+ HOST=\\`facter ec2_public_hostname 2>/dev/null | xargs echo -n\\`
56
+ if [ -z "\\$HOST" ]
55
57
  then
56
- HOST=`ip -f inet addr show | grep -Po 'inet \K[\d.]+' | grep 10.245 | head -1`
57
- if [ -z "$HOST" ]
58
+ HOST=\\`ip -f inet addr show | grep -Po 'inet \\K[\\d.]+' | grep 10.245 | head -1\\`
59
+ if [ -z "\\$HOST" ]
58
60
  then
59
- HOST=`ip -f inet addr show | grep -Po 'inet \K[\d.]+' | grep 10. | head -1`
60
- if [ -z "$HOST" ]
61
+ HOST=\\`ip -f inet addr show | grep -Po 'inet \\K[\\d.]+' | grep 10. | head -1\\`
62
+ if [ -z "\\$HOST" ]
61
63
  then
62
64
  HOST=localhost
63
65
  fi
64
66
  fi
65
67
  fi
66
68
 
69
+ echo Host: \\$HOST
70
+
67
71
  cat > /usr/lib/systemd/system/openshift.service <<DELIM
68
72
  [Unit]
69
73
  Description=OpenShift
@@ -74,11 +78,16 @@ Documentation=https://github.com/openshift/origin
74
78
  [Service]
75
79
  Type=simple
76
80
  EnvironmentFile=-/etc/profile.d/openshift.sh
77
- ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --public-master=https://${HOST}:8443
81
+ ExecStart=$ORIGIN_PATH/_output/local/go/bin/openshift start --public-master=https://\\${HOST}:8443
78
82
 
79
83
  [Install]
80
84
  WantedBy=multi-user.target
81
85
  DELIM
86
+ systemctl daemon-reload
87
+ OUTERDELIM
88
+
89
+ chmod +x /usr/bin/generate_openshift_service
90
+ /usr/bin/generate_openshift_service
82
91
 
83
92
  #systemctl enable openshift.service
84
93
 
data/lib/vagrant-openshift/action/install_openshift3_base_dependencies.rb CHANGED
@@ -30,7 +30,8 @@ module Vagrant
30
30
  # FIXME: Move 'openshift/centos-mongodb' into openshift org and then
31
31
  # add the image into 'repositories' constants
32
32
  #
33
- sudo(env[:machine], "yum install -y git fontconfig yum-utils wget make mlocate bind augeas vim docker-io hg bzr libselinux-devel vim tig glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ e2fsprogs tmux tmux httpie ctags hg xfsprogs rubygems openvswitch bridge-utils bzip2")
33
+ sudo(env[:machine], "yum install -y git fontconfig yum-utils wget make mlocate bind augeas vim docker-io hg bzr libselinux-devel vim tig glibc-static btrfs-progs-devel device-mapper-devel sqlite-devel libnetfilter_queue-devel gcc gcc-c++ e2fsprogs tmux tmux httpie ctags hg xfsprogs rubygems openvswitch bridge-utils bzip2 screen")
34
+ sudo(env[:machine], "yum install -y facter", {fail_on_error: false})
34
35
  #
35
36
  # FIXME: Need to install golang packages 'after' the 'gcc' is
36
37
  # installed. See BZ#1101508
@@ -44,6 +45,8 @@ set -x
44
45
  sed -i 's,^SELINUX=.*,SELINUX=permissive,' /etc/selinux/config
45
46
  setenforce 0
46
47
 
48
+ groupadd docker
49
+ chown root:docker /var/run/docker.sock
47
50
  usermod -a -G docker #{ssh_user}
48
51
 
49
52
  sed -i "s,^OPTIONS='\\(.*\\)',OPTIONS='--insecure-registry=172.30.17.0/24 \\1'," /etc/sysconfig/docker
data/lib/vagrant-openshift/version.rb CHANGED
@@ -16,6 +16,6 @@
16
16
 
17
17
  module Vagrant
18
18
  module Openshift
19
- VERSION = "1.0.15"
19
+ VERSION = "1.0.16"
20
20
  end
21
21
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-openshift
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.15
4
+ version: 1.0.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - Red Hat
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-03 00:00:00.000000000 Z
11
+ date: 2015-02-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake