From 39b46e7e43dffff8f4abfbc142c9e28c9ce0d260 Mon Sep 17 00:00:00 2001 From: spisarski Date: Wed, 21 Jun 2017 11:38:35 -0600 Subject: Fixed launcher app to support new settings kwargs. Additionally, found issue with importing ansible libraries. Needed to rename the snaps.provisioning.ansible package to 'ansible_pb'. JIRA: SNAPS-107 & SNAPS-93 Change-Id: I8c8628d3af5ce30849229ed47bfbb0ecaad5b3ad Signed-off-by: spisarski --- snaps/provisioning/ansible/__init__.py | 15 ------------- .../ansible/centos-network-setup/__init__.py | 15 ------------- .../centos-network-setup/playbooks/__init__.py | 15 ------------- .../playbooks/configure_host.yml | 26 ---------------------- .../centos-network-setup/templates/ifcfg-interface | 14 ------------ .../ansible/ubuntu-network-setup/__init__.py | 15 ------------- .../ubuntu-network-setup/playbooks/__init__.py | 15 ------------- .../playbooks/configure_host.yml | 26 ---------------------- .../ubuntu-network-setup/templates/ethN.cfg | 2 -- snaps/provisioning/ansible_pb/__init__.py | 0 .../ansible_pb/centos-network-setup/__init__.py | 0 .../centos-network-setup/playbooks/__init__.py | 0 .../playbooks/configure_host.yml | 26 ++++++++++++++++++++++ .../centos-network-setup/templates/ifcfg-interface | 14 ++++++++++++ .../ansible_pb/ubuntu-network-setup/__init__.py | 0 .../ubuntu-network-setup/playbooks/__init__.py | 0 .../playbooks/configure_host.yml | 26 ++++++++++++++++++++++ .../ubuntu-network-setup/templates/ethN.cfg | 2 ++ 18 files changed, 68 insertions(+), 143 deletions(-) delete mode 100644 snaps/provisioning/ansible/__init__.py delete mode 100644 snaps/provisioning/ansible/centos-network-setup/__init__.py delete mode 100644 snaps/provisioning/ansible/centos-network-setup/playbooks/__init__.py delete mode 100644 snaps/provisioning/ansible/centos-network-setup/playbooks/configure_host.yml delete mode 100644 snaps/provisioning/ansible/centos-network-setup/templates/ifcfg-interface delete mode 100644 snaps/provisioning/ansible/ubuntu-network-setup/__init__.py delete mode 100644 snaps/provisioning/ansible/ubuntu-network-setup/playbooks/__init__.py delete mode 100644 snaps/provisioning/ansible/ubuntu-network-setup/playbooks/configure_host.yml delete mode 100644 snaps/provisioning/ansible/ubuntu-network-setup/templates/ethN.cfg create mode 100644 snaps/provisioning/ansible_pb/__init__.py create mode 100644 snaps/provisioning/ansible_pb/centos-network-setup/__init__.py create mode 100644 snaps/provisioning/ansible_pb/centos-network-setup/playbooks/__init__.py create mode 100644 snaps/provisioning/ansible_pb/centos-network-setup/playbooks/configure_host.yml create mode 100644 snaps/provisioning/ansible_pb/centos-network-setup/templates/ifcfg-interface create mode 100644 snaps/provisioning/ansible_pb/ubuntu-network-setup/__init__.py create mode 100644 snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/__init__.py create mode 100644 snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/configure_host.yml create mode 100644 snaps/provisioning/ansible_pb/ubuntu-network-setup/templates/ethN.cfg (limited to 'snaps/provisioning') diff --git a/snaps/provisioning/ansible/__init__.py b/snaps/provisioning/ansible/__init__.py deleted file mode 100644 index e3e876e..0000000 --- a/snaps/provisioning/ansible/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") -# and others. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -__author__ = 'spisarski' diff --git a/snaps/provisioning/ansible/centos-network-setup/__init__.py b/snaps/provisioning/ansible/centos-network-setup/__init__.py deleted file mode 100644 index e3e876e..0000000 --- a/snaps/provisioning/ansible/centos-network-setup/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") -# and others. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -__author__ = 'spisarski' diff --git a/snaps/provisioning/ansible/centos-network-setup/playbooks/__init__.py b/snaps/provisioning/ansible/centos-network-setup/playbooks/__init__.py deleted file mode 100644 index e3e876e..0000000 --- a/snaps/provisioning/ansible/centos-network-setup/playbooks/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") -# and others. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -__author__ = 'spisarski' diff --git a/snaps/provisioning/ansible/centos-network-setup/playbooks/configure_host.yml b/snaps/provisioning/ansible/centos-network-setup/playbooks/configure_host.yml deleted file mode 100644 index 8df03cb..0000000 --- a/snaps/provisioning/ansible/centos-network-setup/playbooks/configure_host.yml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") -# and others. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -- name: Configure NIC - hosts: all - become: yes - become_method: sudo - become_user: root - - tasks: - - name: Setup /etc/sysconfig/network-scripts/ifcfg-eth1 file - action: template owner=root group=root mode=644 src=../templates/ifcfg-interface dest=/etc/sysconfig/network-scripts/ifcfg-{{nic_name}} - - name : Restart Network - command: systemctl restart network \ No newline at end of file diff --git a/snaps/provisioning/ansible/centos-network-setup/templates/ifcfg-interface b/snaps/provisioning/ansible/centos-network-setup/templates/ifcfg-interface deleted file mode 100644 index 47aa3fa..0000000 --- a/snaps/provisioning/ansible/centos-network-setup/templates/ifcfg-interface +++ /dev/null @@ -1,14 +0,0 @@ -DEVICE={{ nic_name }} -NAME={{ nic_name }} -IPADDR={{ nic_ip }} - -DEFROUTE=no -NETMASK=255.255.255.0 -NM_CONTROLLED=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_PEERDNS=yes -IPV6_PEERROUTES=yes -IPV6_FAILURE_FATAL=no -ONBOOT=yes \ No newline at end of file diff --git a/snaps/provisioning/ansible/ubuntu-network-setup/__init__.py b/snaps/provisioning/ansible/ubuntu-network-setup/__init__.py deleted file mode 100644 index e3e876e..0000000 --- a/snaps/provisioning/ansible/ubuntu-network-setup/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") -# and others. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -__author__ = 'spisarski' diff --git a/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/__init__.py b/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/__init__.py deleted file mode 100644 index e3e876e..0000000 --- a/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") -# and others. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -__author__ = 'spisarski' diff --git a/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/configure_host.yml b/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/configure_host.yml deleted file mode 100644 index 5d43f96..0000000 --- a/snaps/provisioning/ansible/ubuntu-network-setup/playbooks/configure_host.yml +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") -# and others. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. ---- -- name: Configure NIC - hosts: all - become: yes - become_method: sudo - become_user: root - - tasks: - - name: Setup /etc/network/interfaces.d/{{nic_name}}.cfg file - action: template owner=root group=root mode=644 src=../templates/ethN.cfg dest=/etc/network/interfaces.d/{{nic_name}}.cfg - - name : Restart Network - command: service networking restart \ No newline at end of file diff --git a/snaps/provisioning/ansible/ubuntu-network-setup/templates/ethN.cfg b/snaps/provisioning/ansible/ubuntu-network-setup/templates/ethN.cfg deleted file mode 100644 index 3fa7708..0000000 --- a/snaps/provisioning/ansible/ubuntu-network-setup/templates/ethN.cfg +++ /dev/null @@ -1,2 +0,0 @@ -auto {{ nic_name }} -iface {{ nic_name }} inet dhcp diff --git a/snaps/provisioning/ansible_pb/__init__.py b/snaps/provisioning/ansible_pb/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/snaps/provisioning/ansible_pb/centos-network-setup/__init__.py b/snaps/provisioning/ansible_pb/centos-network-setup/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/__init__.py b/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/configure_host.yml b/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/configure_host.yml new file mode 100644 index 0000000..8df03cb --- /dev/null +++ b/snaps/provisioning/ansible_pb/centos-network-setup/playbooks/configure_host.yml @@ -0,0 +1,26 @@ +# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") +# and others. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- +- name: Configure NIC + hosts: all + become: yes + become_method: sudo + become_user: root + + tasks: + - name: Setup /etc/sysconfig/network-scripts/ifcfg-eth1 file + action: template owner=root group=root mode=644 src=../templates/ifcfg-interface dest=/etc/sysconfig/network-scripts/ifcfg-{{nic_name}} + - name : Restart Network + command: systemctl restart network \ No newline at end of file diff --git a/snaps/provisioning/ansible_pb/centos-network-setup/templates/ifcfg-interface b/snaps/provisioning/ansible_pb/centos-network-setup/templates/ifcfg-interface new file mode 100644 index 0000000..47aa3fa --- /dev/null +++ b/snaps/provisioning/ansible_pb/centos-network-setup/templates/ifcfg-interface @@ -0,0 +1,14 @@ +DEVICE={{ nic_name }} +NAME={{ nic_name }} +IPADDR={{ nic_ip }} + +DEFROUTE=no +NETMASK=255.255.255.0 +NM_CONTROLLED=no +IPV6INIT=yes +IPV6_AUTOCONF=yes +IPV6_DEFROUTE=yes +IPV6_PEERDNS=yes +IPV6_PEERROUTES=yes +IPV6_FAILURE_FATAL=no +ONBOOT=yes \ No newline at end of file diff --git a/snaps/provisioning/ansible_pb/ubuntu-network-setup/__init__.py b/snaps/provisioning/ansible_pb/ubuntu-network-setup/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/__init__.py b/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/configure_host.yml b/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/configure_host.yml new file mode 100644 index 0000000..5d43f96 --- /dev/null +++ b/snaps/provisioning/ansible_pb/ubuntu-network-setup/playbooks/configure_host.yml @@ -0,0 +1,26 @@ +# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") +# and others. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- +- name: Configure NIC + hosts: all + become: yes + become_method: sudo + become_user: root + + tasks: + - name: Setup /etc/network/interfaces.d/{{nic_name}}.cfg file + action: template owner=root group=root mode=644 src=../templates/ethN.cfg dest=/etc/network/interfaces.d/{{nic_name}}.cfg + - name : Restart Network + command: service networking restart \ No newline at end of file diff --git a/snaps/provisioning/ansible_pb/ubuntu-network-setup/templates/ethN.cfg b/snaps/provisioning/ansible_pb/ubuntu-network-setup/templates/ethN.cfg new file mode 100644 index 0000000..3fa7708 --- /dev/null +++ b/snaps/provisioning/ansible_pb/ubuntu-network-setup/templates/ethN.cfg @@ -0,0 +1,2 @@ +auto {{ nic_name }} +iface {{ nic_name }} inet dhcp -- cgit 1.2.3-korg