Commit 796f7ec5 authored by James T. Lee's avatar James T. Lee
Browse files

Change certname from ci to builder

CI is jargon.
parent 1dab5642
Pipeline #651 canceled with stage
in 2392 minutes and 5 seconds
......@@ -13,8 +13,8 @@
--build-arg FACTER_makeopts="$CI_HOST_MAKEOPTS"
--build-arg PROFILE="${CPU}/${ROLE}"
-v "/usr/bin/qemu-${QEMU_ARCH}:/usr/bin/qemu-${QEMU_ARCH}:ro"
-v "${PUPPET_CERTIFICATE}:/etc/puppetlabs/puppet/ssl/certs/ci.pem"
-v "${PUPPET_PRIVATE_KEY}:/etc/puppetlabs/puppet/ssl/private_keys/ci.pem"
-v "${PUPPET_CERTIFICATE}:/etc/puppetlabs/puppet/ssl/certs/builder.pem"
-v "${PUPPET_PRIVATE_KEY}:/etc/puppetlabs/puppet/ssl/private_keys/builder.pem"
-v "${PWD}/debug/usr/lib/debug:/usr/lib/debug"
-v /nest:/nest
-t "${CI_REGISTRY_IMAGE}:${CPU}-${ROLE}" .'
......
......@@ -9,7 +9,7 @@ ARG PROFILE
RUN eix-sync -q
# Configure locales and set up some conveniences
RUN puppet agent --test --certname ci --environment main --tags nest::base::distcc,nest::base::locale,nest::base::portage,nest::base::puppet --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
RUN puppet agent --test --certname builder --environment main --tags nest::base::distcc,nest::base::locale,nest::base::portage,nest::base::puppet --logdir /var/log/puppet --rundir /var/run/puppet --vardir /var/lib/puppet --runtimeout 0; [ $? -eq 2 ]
# Locale is managed by Puppet, but
# it also needs to be persisted in the image.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment