From 84306bdc3c314218c5d040b2095d3a49b2d670e9 Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Thu, 11 Sep 2014 11:29:01 -0700 Subject: [PATCH] Add production environment to puppet This creates an environment.conf for production for use with Puppet directory environments. Change-Id: I12655eb480ec95293edf8b3534c5b607de2980de --- .../puppetmaster/production_environment.conf | 2 ++ .../manifests/puppetmaster.pp | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 modules/openstack_project/files/puppetmaster/production_environment.conf diff --git a/modules/openstack_project/files/puppetmaster/production_environment.conf b/modules/openstack_project/files/puppetmaster/production_environment.conf new file mode 100644 index 0000000000..dd49ca1dfc --- /dev/null +++ b/modules/openstack_project/files/puppetmaster/production_environment.conf @@ -0,0 +1,2 @@ +manifest = /opt/config/production/manifests/site.pp +modulepath = $basemodulepath:modules:/opt/config/production/modules diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 78808c84a1..48411dcf4a 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -24,6 +24,26 @@ class openstack_project::puppetmaster ( } else { $ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet3.yaml' + + file {'/etc/puppet/environments': + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', + } + file {'/etc/puppet/environments/production': + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755', + } + file {'/etc/puppet/environments/production/environment.conf': + ensure => file, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf', + } } class { 'ansible':