Merge branch 'release/v0.6.1'

Author: Frąckiewicz Radosław

Diff for: README.rst

@@ -1,10 +1,14 @@
 Puppeter - an automatic puppet installer
 ========================================
 
+**Work In Progress!**
+
 .. image:: https://travis-ci.org/coi-gov-pl/puppeter.svg?branch=develop
     :target: https://travis-ci.org/coi-gov-pl/puppeter
 .. image:: https://coveralls.io/repos/github/coi-gov-pl/puppeter/badge.svg?branch=feature%2Finstall-puppet-agent
     :target: https://coveralls.io/github/coi-gov-pl/puppeter?branch=feature%2Finstall-puppet-agent
+.. image:: https://img.shields.io/pypi/v/puppeter.svg
+    :target: https://pypi.python.org/pypi/puppeter
 
 
 A commandline tool to ease the installation of typical puppetserver - agent installation. It uses a interactive mode and batch mode as well. Batch mode utilizes a answer files for full automatic operation.

Diff for: puppeter/__init__.py

@@ -4,7 +4,7 @@
 from typing import Type
 
 # The version of the app
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 __program__ = 'puppeter'
 
 

Diff for: puppeter/domain/gateway/csr.py

@@ -5,10 +5,11 @@
 
 from puppeter.domain.model.configurer import Configurer
 from puppeter.domain.model.csr import CsrAttributesConfiguration
+from puppeter.domain.model.installer import Mode
 
 
 class CsrAttributesSetterGateway(with_metaclass(ABCMeta)):
     @abstractmethod
-    def save_csr_attributes(self, csr_attrs):
-        # type: (CsrAttributesConfiguration) -> Sequence[Configurer]
+    def save_csr_attributes(self, csr_attrs, mode):
+        # type: (CsrAttributesConfiguration, Mode) -> Sequence[Configurer]
         pass

Diff for: puppeter/persistence/gateway/csr.py

@@ -5,21 +5,30 @@
 from puppeter.domain.gateway.csr import CsrAttributesSetterGateway
 from puppeter.domain.model.configurer import Configurer, ScriptFormat
 from puppeter.domain.model.csr import CsrAttributesConfiguration
+from puppeter.domain.model.installer import Mode
 from puppeter.domain.model.ordered import Order
 
 
 @Order(250)
 class CsrAttributesConfigurer(Configurer):
-    def __init__(self, csr_attrs):
+    def __init__(self, csr_attrs, mode):
         self.__csr_attr = csr_attrs  # type: CsrAttributesConfiguration
+        self.__mode = mode  # type: Mode
 
     def produce_commands(self):
         mapping = dict(
             content=self.__as_yaml()
         )
+        if self.__mode == Mode.Agent:
+            template = 'csr_agent.pp'
+        elif self.__mode == Mode.Server:
+            template = 'csr_server.pp'
+        else:
+            raise Exception('Invalid mode given: {mode}'.format(mode=self.__mode))
+
         return self._collector().collect_from_template(
             description='Configuring puppet node certificate CSR attributes',
-            template='csr.pp',
+            template=template,
             mapping=mapping,
             format=ScriptFormat.PUPPET
         ).lines()
@@ -32,8 +41,8 @@ def __as_yaml(self):
 
 
 class CsrAttributesSetterGatewayImpl(CsrAttributesSetterGateway):
-    def save_csr_attributes(self, csr_attrs):
-        # type: (CsrAttributesConfiguration) -> Sequence[Configurer]
+    def save_csr_attributes(self, csr_attrs, mode):
+        # type: (CsrAttributesConfiguration, Mode) -> Sequence[Configurer]
         return [
-            CsrAttributesConfigurer(csr_attrs)
+            CsrAttributesConfigurer(csr_attrs, mode)
         ]

Diff for: puppeter/persistence/gateway/csr_agent.pp

@@ -0,0 +1,5 @@
+file { "${settings::confdir}/csr_attributes.yaml":
+  ensure  => 'file',
+  mode    => '0640',
+  content => '@{content}',
+}

Diff for: puppeter/persistence/gateway/csr.pp renamed to puppeter/persistence/gateway/csr_server.pp

@@ -2,5 +2,5 @@
   ensure  => 'file',
   mode    => '0640',
   group   => 'puppet',
-  content => '@{content}'
+  content => '@{content}',
 }

Diff for: puppeter/presentation/answersprocessor.py

@@ -92,5 +92,8 @@ def __setup_csr(answers):
         # type: (Answers) -> Sequence[Configurer]
         if answers.csrattrs_configuration() is not None:
             csrsetter = container.get(CsrAttributesSetterGateway)
-            return csrsetter.save_csr_attributes(answers.csrattrs_configuration())
+            return csrsetter.save_csr_attributes(
+                answers.csrattrs_configuration(),
+                answers.installer().mode()
+            )
         return []

Diff for: tests/persistence/gateway/test_csr.py

@@ -0,0 +1,55 @@
+from puppeter.domain.model.csr import CsrAttributesConfiguration
+from puppeter.domain.model.installer import Mode
+from puppeter.persistence.gateway.csr import CsrAttributesConfigurer, CsrAttributesSetterGatewayImpl
+from puppeter import container
+
+
+def test_csr_on_server():
+    # given
+    config = CsrAttributesConfiguration()
+    config.read_raw_options(dict(
+        pp_role='appserver'
+    ))
+    configurer = CsrAttributesConfigurer(config, Mode.Server)
+    container.initialize()
+    # when
+    commands = configurer.produce_commands()
+
+    # then
+    assert '  pp_role: appserver' in commands
+    assert '  group   => \'puppet\',' in commands
+
+
+def test_csr_on_agent():
+    # given
+    config = CsrAttributesConfiguration()
+    config.read_raw_options(dict(
+        pp_role='agent'
+    ))
+    configurer = CsrAttributesConfigurer(config, Mode.Agent)
+    container.initialize()
+
+    # when
+    commands = configurer.produce_commands()
+
+    # then
+    assert '  pp_role: agent' in commands
+
+
+def test_csr_gateway():
+    # given
+    gateway = CsrAttributesSetterGatewayImpl()
+    config = CsrAttributesConfiguration()
+    config.read_raw_options(dict(
+        pp_datacenter='dc1'
+    ))
+    mode = Mode.Server
+
+    # when
+    configurers = gateway.save_csr_attributes(config, mode)
+
+    # then
+    assert len(configurers) == 1
+    op = getattr(configurers[0], "produce_commands", None)
+    assert op is not None
+    assert callable(op)

Diff for: tests/persistence/gateway/test_fgdn.py

@@ -0,0 +1,75 @@
+import pytest
+
+from puppeter.domain.model.osfacts import Docker, OsFamily
+from puppeter.persistence.gateway.fqdn import FqdnSetterGatewayImpl
+
+from puppeter.domain.model.fqdn import FqdnConfiguration
+from tests.domain.mock_facter import MockFacter
+from puppeter import container
+
+
+def test_fqdn_on_redhat():
+    # given
+    gateway = FqdnSetterGatewayImpl()
+    config = FqdnConfiguration(fqdn='appserver.acme.internal')
+    MockFacter.set_fact(Docker, Docker.NO)
+    MockFacter.set_fact(OsFamily, OsFamily.RedHat)
+    container.initialize()
+
+    # when
+    configurers = gateway.process_fully_qualified_domain_name(config)
+
+    # then
+    assert len(configurers) == 1
+
+    # when
+    configurer = configurers[0]
+    commands = configurer.produce_commands()
+
+    # then
+    assert u"    puppet resource host 'appserver.acme.internal' " \
+        "ensure=present host_aliases='appserver' ip=127.0.0.1 " \
+        "comment='FQDN'" in commands
+    assert "    hostname 'appserver'" in commands
+    assert "  changes => 'set HOSTNAME appserver'" in commands
+
+
+def test_fqdn_on_debian():
+    # given
+    gateway = FqdnSetterGatewayImpl()
+    config = FqdnConfiguration(fqdn='appserver.acme.internal')
+    MockFacter.set_fact(Docker, Docker.NO)
+    MockFacter.set_fact(OsFamily, OsFamily.Debian)
+    container.initialize()
+
+    # when
+    configurers = gateway.process_fully_qualified_domain_name(config)
+
+    # then
+    assert len(configurers) == 1
+
+    # when
+    configurer = configurers[0]
+    commands = configurer.produce_commands()
+
+    # then
+    assert u"    puppet resource host 'appserver.acme.internal' " \
+           "ensure=present host_aliases='appserver' ip=127.0.0.1 " \
+           "comment='FQDN'" in commands
+    assert "    hostname 'appserver'" in commands
+    assert u"  content => 'appserver'" in commands
+
+
+def test_fqdn_on_docker():
+    # given
+    gateway = FqdnSetterGatewayImpl()
+    config = FqdnConfiguration(fqdn='appserver.acme.internal')
+    MockFacter.set_fact(Docker, Docker.YES)
+    container.initialize()
+
+    # when
+    with pytest.raises(NotImplementedError) as excinfo:
+        gateway.process_fully_qualified_domain_name(config)
+
+    # then
+    assert "Can't set FQDN when running inside Docker!" in str(excinfo.value)