Merge "Drop variables for legacy networking"

tripleo_ansible/ansible_plugins/modules/tripleo_generate_inventory_network_config.py

@@ -126,8 +126,6 @@ Controller:
        network_config_update: False
        net_config_data_lookup: {}
        bond_interface_ovs_options: bond_mode=balance-slb
-  vars:
-    tripleo_network_config_with_ansible: true
 Compute:
   hosts:
      overcloud-compute-0:
@@ -144,8 +142,6 @@ Compute:
        network_config_update: False
        net_config_data_lookup: {}
        bond_interface_ovs_options: bond_mode=balance-slb
-  vars:
-    tripleo_network_config_with_ansible: true
 '''
 
 EXAMPLES = '''
@@ -219,7 +215,6 @@ def generate_ansible_inventory_network_config(result, module_opts, instances,
         inventory.setdefault(role, dict())
         inventory[role].setdefault('hosts', dict())
         role_vars = inventory[role].setdefault('vars', dict())
-        role_vars.setdefault('tripleo_network_config_with_ansible', True)
         role_vars['tripleo_network_config_hide_sensitive_logs'] = False
 
     for instance in instances:

tripleo_ansible/roles/tripleo_network_config/tasks/os_net_config.yml

@@ -22,9 +22,7 @@
   block:
     - name: Set nic_config_file fact
       set_fact:
-        nic_config_file: "{{ (tripleo_network_config_with_ansible|bool) \
-                          | ternary('/etc/os-net-config/config.yaml', \
-                          '/etc/os-net-config/config.json') }}"
+        nic_config_file: "/etc/os-net-config/config.yaml"
     - name: Render overidden network config
       no_log: "{{ tripleo_network_config_hide_sensitive_logs | bool }}"
       copy:
@@ -34,16 +32,6 @@
         backup: true
       when:
         - tripleo_network_config_override.keys()|length > 0
-    - name: Render network_config
-      no_log: "{{ tripleo_network_config_hide_sensitive_logs | bool }}"
-      template:
-        src: "{{ tripleo_network_config_script_path }}"
-        dest: "{{ nic_config_file }}"
-        mode: 0644
-        backup: true
-      when:
-        - not tripleo_network_config_with_ansible|bool
-        - tripleo_network_config_override.keys()|length == 0
     - name: Render network_config from template
       no_log: "{{ tripleo_network_config_hide_sensitive_logs | bool }}"
       template:
@@ -52,7 +40,6 @@
         mode: 0644
         backup: true
       when:
-        - tripleo_network_config_with_ansible|bool
         - tripleo_network_config_override.keys()|length == 0
     - name: Run tripleo_os_net_config_module with network_config
       tripleo_os_net_config:

tripleo_ansible/tests/modules/test_tripleo_generate_inventory_network_config.py

@@ -71,7 +71,7 @@ class TestTripleoGenerateInventoryNetworkConfig(tests_base.TestCase):
                 },
                 'vars': {
                     'tripleo_network_config_hide_sensitive_logs': False,
-                    'tripleo_network_config_with_ansible': True}
+                }
             },
             'RoleB': {
                 'hosts': {
@@ -86,7 +86,7 @@ class TestTripleoGenerateInventoryNetworkConfig(tests_base.TestCase):
                             'templates/net_config_bridge.j2'}},
                 'vars': {
                     'tripleo_network_config_hide_sensitive_logs': False,
-                    'tripleo_network_config_with_ansible': True}
+                }
             }
         }
         plugin.generate_ansible_inventory_network_config(