summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2014-11-04 14:54:47 -0500
committerKenny Woodson <kwoodson@redhat.com>2014-11-04 14:54:47 -0500
commit1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9 (patch)
tree658c6705b50d9ffdab19dc3c4f620153615e1bdd /roles
parentf57018239a6e6a454fdb878b1189eaf70ae185a2 (diff)
parent3f90353f49770cc03ebf3952778eb51ffe5063c2 (diff)
downloadopenshift-1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9.tar.gz
openshift-1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9.tar.bz2
openshift-1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9.tar.xz
openshift-1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9.zip
Merge pull request #27 from twiest/pr
making atomic proxy be able to be deployed to PROD.
Diffstat (limited to 'roles')
-rw-r--r--roles/atomic_proxy/templates/puppet/puppet.conf.j22
-rw-r--r--roles/docker_img_monitoring/tasks/main.yml4
-rwxr-xr-xroles/docker_img_monitoring/templates/monitoring_container/start.rb.j2 (renamed from roles/docker_img_monitoring/files/monitoring_container/start.rb)4
-rw-r--r--roles/docker_img_puppet/files/puppet_container/Dockerfile3
4 files changed, 10 insertions, 3 deletions
diff --git a/roles/atomic_proxy/templates/puppet/puppet.conf.j2 b/roles/atomic_proxy/templates/puppet/puppet.conf.j2
index 9a47ab11c..9731ff168 100644
--- a/roles/atomic_proxy/templates/puppet/puppet.conf.j2
+++ b/roles/atomic_proxy/templates/puppet/puppet.conf.j2
@@ -1,6 +1,6 @@
[main]
# we need to override the host name of the container
- certname = ctr-proxy.stg.rhcloud.com
+ certname = ctr-proxy.{{ oo_env }}.rhcloud.com
# The Puppet log directory.
# The default value is '$vardir/log'.
diff --git a/roles/docker_img_monitoring/tasks/main.yml b/roles/docker_img_monitoring/tasks/main.yml
index ce8d5a0a9..dce918cb6 100644
--- a/roles/docker_img_monitoring/tasks/main.yml
+++ b/roles/docker_img_monitoring/tasks/main.yml
@@ -7,4 +7,8 @@
with_items:
- { name: 'Dockerfile', mode: '644' }
- { name: 'register-with-zabbix.rb', mode: '755' }
+
+- name: deploy monitoring image build templates
+ template: "src=monitoring_container/{{ item.name }}.j2 dest=/usr/local/etc/containers/monitoring_container/{{ item.name }} mode={{ item.mode }}"
+ with_items:
- { name: 'start.rb', mode: '755' }
diff --git a/roles/docker_img_monitoring/files/monitoring_container/start.rb b/roles/docker_img_monitoring/templates/monitoring_container/start.rb.j2
index 7cd713707..70d60f87b 100755
--- a/roles/docker_img_monitoring/files/monitoring_container/start.rb
+++ b/roles/docker_img_monitoring/templates/monitoring_container/start.rb.j2
@@ -5,9 +5,9 @@ require 'fileutils'
# TODO: These should be passed in as env vars. When we're in a POD, make sure to do this.
# WORKAROUND: ^^
-OO_ENV = 'stg'
+OO_ENV = '{{ oo_env }}'
OO_CTR_TYPE = 'proxy'
-HOSTGROUPS = ['STG Environment']
+HOSTGROUPS = {{ oo_zabbix_hostgroups | to_nice_json }}
TEMPLATES = ['Template OpenShift Proxy Ctr']
CTR_NAME = "ctr-#{OO_CTR_TYPE}-#{OO_ENV}-#{ENV['container_uuid'][0..6]}"
diff --git a/roles/docker_img_puppet/files/puppet_container/Dockerfile b/roles/docker_img_puppet/files/puppet_container/Dockerfile
index 0bc72d389..d5cdf1005 100644
--- a/roles/docker_img_puppet/files/puppet_container/Dockerfile
+++ b/roles/docker_img_puppet/files/puppet_container/Dockerfile
@@ -13,6 +13,9 @@ RUN yum -y install puppet3 crontabs cronie-anacron cronie system-config-firewall
RUN rm /usr/sbin/lokkit ; ln -s /bin/true /usr/sbin/lokkit
+# this is needed so that we can run puppet without running the start script
+RUN mkdir -p /etc/haproxy
+
# END: These are to fake out puppet
# Container specific files