Browse Source

Remove RoleConfig

Now that config-download is the default, RoleConfig and the associated
deployment isn't used anymore, let's remove it.

Change-Id: I0fbaccfea8f583101b03c6ee645ff01dac11b7af
Thomas Herve 2 months ago
parent
commit
c95f315ef0
2 changed files with 0 additions and 127 deletions
  1. 0
    112
      common/deploy-steps.j2
  2. 0
    15
      overcloud.j2.yaml

+ 0
- 112
common/deploy-steps.j2 View File

@@ -35,9 +35,6 @@ parameters:
35 35
   servers:
36 36
     type: json
37 37
     description: Mapping of Role name e.g Controller to a list of servers
38
-  stack_name:
39
-    type: string
40
-    description: Name of the topmost stack
41 38
   role_data:
42 39
     type: json
43 40
     description: Mapping of Role name e.g Controller to the per-role data
@@ -86,16 +83,6 @@ parameters:
86 83
     type: boolean
87 84
     default: true
88 85
     description: Whether containerized puppet executions use modules from the baremetal host. Defaults to true. Can be set to false to consume puppet modules from containers directly.
89
-  ctlplane_service_ips:
90
-    type: json
91
-  blacklisted_ip_addresses:
92
-    description: List of IP addresses belong to blacklisted servers
93
-    type: comma_delimited_list
94
-    default: []
95
-  blacklisted_hostnames:
96
-    description: List of hostnames belong to blacklisted servers
97
-    type: comma_delimited_list
98
-    default: []
99 86
   FastForwardUpgradeReleases:
100 87
     type: comma_delimited_list
101 88
     default: ['ocata', 'pike', 'queens']
@@ -103,10 +90,6 @@ parameters:
103 90
   ssh_known_hosts_hostnames:
104 91
     description: Mapping of hostname to ssh known hosts entry
105 92
     type: json
106
-  PythonInterpreter:
107
-    type: string
108
-    description: The python interpreter to use for python and ansible actions
109
-    default: /usr/bin/python
110 93
 {% for role in enabled_roles %}
111 94
   {{role.name}}Count:
112 95
     description: Number of {{role.name}} nodes to deploy
@@ -125,48 +108,6 @@ conditions:
125 108
 
126 109
 resources:
127 110
 
128
-  RoleConfig:
129
-    type: OS::Heat::SoftwareConfig
130
-    properties:
131
-      group: ansible
132
-      options:
133
-        modulepath: /usr/share/ansible-modules
134
-      inputs:
135
-        - name: step
136
-        - name: tripleo_role_name
137
-        - name: deploy_identifier
138
-        - name: bootstrap_server_id
139
-        - name: enable_debug
140
-        - name: enable_puppet
141
-        - name: docker_puppet_debug
142
-        - name: container_cli
143
-        - name: docker_puppet_process_count
144
-        - name: docker_puppet_mount_host_puppet
145
-        - name: role_data_step_config
146
-        - name: role_data_puppet_config
147
-          type: Json
148
-        - name: role_data_docker_config_scripts
149
-          type: Json
150
-        - name: role_data_docker_puppet_tasks
151
-          type: Json
152
-        - name: role_data_docker_config
153
-          type: Json
154
-        - name: role_data_kolla_config
155
-          type: Json
156
-        - name: ansible_python_interpreter
157
-          description: Python interpreter to use for the ansible execution
158
-          default: {get_param: PythonInterpreter}
159
-
160
-      config:
161
-        str_replace:
162
-          template: |
163
-            - hosts: localhost
164
-              connection: local
165
-              tasks:
166
-              _TASKS
167
-          params:
168
-            _TASKS: {get_file: deploy-steps-tasks.yaml}
169
-
170 111
   ExternalDeployTasks:
171 112
     type: OS::Heat::Value
172 113
     properties:
@@ -250,62 +191,11 @@ resources:
250 191
 
251 192
   # BEGIN CONFIG STEPS, only on enabled_roles
252 193
 {%- for role in enabled_roles %}
253
-  # Deployment steps for {{role.name}}
254
-  # A single config is re-applied with an incrementing step number
255
-  {% for step in range(1, deploy_steps_max) %}
256
-  {{role.name}}Deployment_Step{{step}}:
257
-    type: OS::TripleO::DeploymentSteps
258
-    condition: {{role.name}}NonZero
259
-    depends_on:
260
-    # TODO(gfidente): the following if/else condition
261
-    # replicates what is already defined for the
262
-    # WorkflowTasks_StepX resource and can be remove
263
-    # if https://bugs.launchpad.net/heat/+bug/1700569
264
-    # is fixed.
265
-    {%- if step == 1 %}
266
-    {%- for dep in enabled_roles %}
267
-      - {{dep.name}}ArtifactsDeploy
268
-    {%- endfor %}
269
-    {%- else %}
270
-    {%- for dep in enabled_roles %}
271
-      - {{dep.name}}Deployment_Step{{step -1}}
272
-    {%- endfor %}
273
-    {%- endif %}
274
-    properties:
275
-      name: {{role.name}}Deployment_Step{{step}}
276
-      servers: {get_param: [servers, {{role.name}}]}
277
-      config: {get_resource: RoleConfig}
278
-      input_values:
279
-        step: {{step}}
280
-        tripleo_role_name: {{role.name}}
281
-        deploy_identifier: {get_param: DeployIdentifier}
282
-        bootstrap_server_id: {get_attr: [BootstrapServerId, value]}
283
-        enable_debug: {get_param: ConfigDebug}
284
-        enable_puppet: {get_param: EnablePuppet}
285
-        docker_puppet_debug: {get_param: DockerPuppetDebug}
286
-        container_cli: {get_param: ContainerCli}
287
-        docker_puppet_process_count: {get_param: DockerPuppetProcessCount}
288
-        docker_puppet_mount_host_puppet: {get_param: DockerPuppetMountHostPuppet}
289
-        role_data_step_config: {get_param: [role_data, {{role.name}}, step_config]}
290
-        role_data_puppet_config: {get_param: [role_data, {{role.name}}, puppet_config]}
291
-        role_data_docker_config_scripts: {get_param: [role_data, {{role.name}}, docker_config_scripts]}
292
-        role_data_docker_puppet_tasks: {get_param: [role_data, {{role.name}}, docker_puppet_tasks]}
293
-        role_data_docker_config: {get_param: [role_data, {{role.name}}, docker_config]}
294
-        role_data_kolla_config: {get_param: [role_data, {{role.name}}, kolla_config]}
295
-        deploy_steps_max: {{deploy_steps_max}}
296
-
297
-  {% endfor %}
298
-  # END CONFIG STEPS
299
-
300 194
   # Note, this should be the last step to execute configuration changes.
301 195
   # Ensure that all {{role.name}}ExtraConfigPost steps are executed
302 196
   # after all the previous deployment steps.
303 197
   {{role.name}}ExtraConfigPost:
304 198
     condition: {{role.name}}NonZero
305
-    depends_on:
306
-  {%- for dep in enabled_roles %}
307
-      - {{dep.name}}Deployment_Step{{deploy_steps_max - 1}}
308
-  {%- endfor %}
309 199
     type: OS::TripleO::NodeExtraConfigPost
310 200
     properties:
311 201
         servers: {get_param: [servers, {{role.name}}]}
@@ -324,8 +214,6 @@ resources:
324 214
       servers:  {get_param: servers}
325 215
       input_values:
326 216
         deploy_identifier: {get_param: DeployIdentifier}
327
-
328
-
329 217
 {% endfor %}
330 218
 
331 219
 outputs:

+ 0
- 15
overcloud.j2.yaml View File

@@ -973,20 +973,7 @@ resources:
973 973
 {%- for role in roles %}
974 974
         {{role.name}}: {get_attr: [{{role.name}}Servers, value]}
975 975
 {%- endfor %}
976
-      stack_name: {get_param: 'OS::stack_name'}
977 976
       EndpointMap: {get_attr: [EndpointMapData, value]}
978
-      ctlplane_service_ips:
979
-        # Note (shardy) this somewhat complex yaql may be replaced
980
-        # with a map_deep_merge function in ocata.  It merges the
981
-        # list of maps, but appends to colliding lists when a service
982
-        # is deployed on more than one role
983
-        yaql:
984
-          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
985
-          data:
986
-            l:
987
-{%- for role in roles %}
988
-              - {get_attr: [{{role.name}}IpListMap, ctlplane_service_ips]}
989
-{%- endfor %}
990 977
       role_data:
991 978
 {%- for role in roles %}
992 979
         {{role.name}}:
@@ -994,8 +981,6 @@ resources:
994 981
           - {get_attr: [{{role.name}}ServiceChainRoleData, value]}
995 982
           - {get_attr: [{{role.name}}MergedConfigSettings, value]}
996 983
 {%- endfor %}
997
-      blacklisted_ip_addresses: {get_attr: [BlacklistedIpAddresses, value]}
998
-      blacklisted_hostnames: {get_attr: [BlacklistedHostnames, value]}
999 984
       ssh_known_hosts_hostnames: {get_attr: [SshKnownHostsHostnames, value]}
1000 985
 {%- for role in roles %}
1001 986
       {{role.name}}Count: {get_param: {{role.name}}Count}

Loading…
Cancel
Save