Merge "Adds network/cidr mapping into a new service property"

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 039bd6b..85520fc 100644 (file)
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -1,3 +1,9 @@
+{# ## Some variables are set to enable rendering backwards compatible templates #}
+{# ## where a few parameter/resource names don't match the expected pattern #}
+{# ## FIXME: we need some way to deprecate the old inconsistent parameters #}
+{%- if role.name == 'Controller' -%}
+  {%- set deprecated_extraconfig_param  = 'controllerExtraConfig'  -%}
+{% endif %}
 heat_template_version: pike
 description: 'OpenStack {{role.name}} node configured by Puppet'
 parameters:
@@ -70,6 +76,13 @@ parameters:
     description: |
       Role specific additional hiera configuration to inject into the cluster.
     type: json
+{%- if deprecated_extraconfig_param is defined %}
+  {{deprecated_extraconfig_param}}:
+    default: {}
+    description: |
+      DEPRECATED use {{role.name}}ExtraConfig instead
+    type: json
+{%- endif %}
   {{role.name}}IPs:
     default: {}
     type: json
@@ -189,6 +202,14 @@ parameters:
           object: 0
     default: {}
 
+{% if deprecated_extraconfig_param is defined %}
+parameter_groups:
+- label: deprecated
+  description: Do not use deprecated params, they will be removed.
+  parameters:
+  - {{deprecated_extraconfig_param}}
+{%- endif %}
+
 conditions:
   server_not_blacklisted:
     not:
@@ -474,7 +495,12 @@ resources:
             map_replace:
               - {get_param: ServiceConfigSettings}
               - values: {get_attr: [NetIpMap, net_ip_map]}
-          {{role.name.lower()}}_extraconfig: {get_param: {{role.name}}ExtraConfig}
+          {{role.name.lower()}}_extraconfig:
+            map_merge:
+{%- if deprecated_extraconfig_param is defined %}
+              - {get_param: {{deprecated_extraconfig_param}}}
+{%- endif %}
+              - {get_param: {{role.name}}ExtraConfig}
           extraconfig: {get_param: ExtraConfig}
           {{role.name.lower()}}:
             tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}

diff --git a/puppet/services/database/mongodb-base.yaml b/puppet/services/database/mongodb-base.yaml
index c218e8b..2881a5c 100644 (file)
--- a/puppet/services/database/mongodb-base.yaml
+++ b/puppet/services/database/mongodb-base.yaml
@@ -56,3 +56,7 @@ outputs:
         mongodb::server::journal: false
         mongodb::server::ipv6: {get_param: MongoDbIPv6}
         mongodb::server::replset: {get_param: MongoDbReplset}
+        # for now, we don't want to manage these services which are enabled
+        # by default with recent changes in puppet-systemd.
+        systemd::manage_networkd: false
+        systemd::manage_resolved: false

diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml
index 8842a0c..9b8386c 100644 (file)
--- a/puppet/services/database/mysql.yaml
+++ b/puppet/services/database/mysql.yaml
@@ -96,6 +96,10 @@ outputs:
                     - {get_param: [DefaultPasswords, mysql_root_password]}
             mysql_clustercheck_password: {get_param: MysqlClustercheckPassword}
             enable_galera: {get_param: EnableGalera}
+            # for now, we don't want to manage these services which are enabled
+            # by default with recent changes in puppet-systemd.
+            systemd::manage_networkd: false
+            systemd::manage_resolved: false
             # NOTE: bind IP is found in Heat replacing the network name with the
             # local node IP for the given network; replacement examples
             # (eg. for internal_api):

diff --git a/releasenotes/notes/systemd-d9a41bb3709d0653.yaml b/releasenotes/notes/systemd-d9a41bb3709d0653.yaml
new file mode 100644 (file)
index 0000000..af66f89
--- /dev/null
+++ b/releasenotes/notes/systemd-d9a41bb3709d0653.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    Latest commits in puppet-systemd enabled by default systemd-networkd and
+    systemd-resolved but we don't want to manage them for now in TripleO.
+    MySQL and MongoDB services were managing some systemd resources so now
+    we ensure that these 2 systemd services are disabled. In the future, we
+    might want and activate these services and revert that patch but for now
+    we want to disable them.