summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authoredan.binshtok <eb578m@intl.att.com>2017-11-21 13:36:53 +0200
committeredan.binshtok <eb578m@intl.att.com>2017-11-21 13:39:44 +0200
commiteb123edb162afc20da8d618df1e77d73b8236f6d (patch)
tree1adcd09b52f31c905f5c58c9f3a5b322b7b166d2 /ansible
parentf52ddcb67f75aeb6bd72fecfd4a133ae1eb56666 (diff)
Update latest change to devkit
remove bootstrap role readme updated README replaced headers in matchbox templates brand removal for default zone remove dev rsync dir due to file name Issue-ID: VVP-32 Change-Id: I8ebedd80b031da02b6daaaee390956197301ec2c Signed-off-by: edan.binshtok <eb578m@intl.att.com>
Diffstat (limited to 'ansible')
-rw-r--r--[-rwxr-xr-x]ansible/ansible.cfg0
-rw-r--r--[-rwxr-xr-x]ansible/application.yml0
-rw-r--r--[-rwxr-xr-x]ansible/infrastructure.yml0
-rw-r--r--[-rwxr-xr-x]ansible/library/kubectl_apply_manifest.py8
-rw-r--r--[-rwxr-xr-x]ansible/requirements.yml0
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/defaults/main.yml0
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/files/iceundionly.kpxebin64340 -> 64340 bytes
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/meta/main.yml0
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/tasks/dnsmasq.yml0
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/tasks/main.yml0
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/tasks/matchbox.yml0
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/tasks/tls.yml0
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/dnsmasq.conf.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/groups/group.json.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/groups/install.json.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/ignition/coreos-install.yaml.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/ignition/worker.yaml.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/kubeconfig.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/openssl.config.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/profiles/controller.json.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/profiles/install-reboot.json.j20
-rw-r--r--[-rwxr-xr-x]ansible/roles/ansible-vvp-bootstrap/templates/profiles/worker.json.j20
-rw-r--r--[-rwxr-xr-x]ansible/simple-deploy.yml0
24 files changed, 5 insertions, 3 deletions
diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
index 4a72589..4a72589 100755..100644
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
diff --git a/ansible/application.yml b/ansible/application.yml
index 7e305cc..7e305cc 100755..100644
--- a/ansible/application.yml
+++ b/ansible/application.yml
diff --git a/ansible/infrastructure.yml b/ansible/infrastructure.yml
index 0e700ca..0e700ca 100755..100644
--- a/ansible/infrastructure.yml
+++ b/ansible/infrastructure.yml
diff --git a/ansible/library/kubectl_apply_manifest.py b/ansible/library/kubectl_apply_manifest.py
index 75c68cb..dce93c6 100755..100644
--- a/ansible/library/kubectl_apply_manifest.py
+++ b/ansible/library/kubectl_apply_manifest.py
@@ -1,5 +1,6 @@
-# -*- encoding: utf-8 -*-
-# ============LICENSE_START=======================================================
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+# ============LICENSE_START===============================================
# org.onap.vvp/engagementmgr
# ===================================================================
# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@ -36,7 +37,7 @@
# ============LICENSE_END============================================
#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#!/usr/bin/python
+
import os
from ansible.module_utils.basic import AnsibleModule
@@ -69,5 +70,6 @@ def main():
msg = "Could not apply manifest"
module.fail_json(msg=msg + " " + stderr)
+
if __name__ == "__main__":
main()
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index ea1e8d0..ea1e8d0 100755..100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
diff --git a/ansible/roles/ansible-vvp-bootstrap/defaults/main.yml b/ansible/roles/ansible-vvp-bootstrap/defaults/main.yml
index 9d39136..9d39136 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/defaults/main.yml
+++ b/ansible/roles/ansible-vvp-bootstrap/defaults/main.yml
diff --git a/ansible/roles/ansible-vvp-bootstrap/files/iceundionly.kpxe b/ansible/roles/ansible-vvp-bootstrap/files/iceundionly.kpxe
index ccda67b..ccda67b 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/files/iceundionly.kpxe
+++ b/ansible/roles/ansible-vvp-bootstrap/files/iceundionly.kpxe
Binary files differ
diff --git a/ansible/roles/ansible-vvp-bootstrap/meta/main.yml b/ansible/roles/ansible-vvp-bootstrap/meta/main.yml
index 6b0bfdd..6b0bfdd 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/meta/main.yml
+++ b/ansible/roles/ansible-vvp-bootstrap/meta/main.yml
diff --git a/ansible/roles/ansible-vvp-bootstrap/tasks/dnsmasq.yml b/ansible/roles/ansible-vvp-bootstrap/tasks/dnsmasq.yml
index 48dad1c..48dad1c 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/tasks/dnsmasq.yml
+++ b/ansible/roles/ansible-vvp-bootstrap/tasks/dnsmasq.yml
diff --git a/ansible/roles/ansible-vvp-bootstrap/tasks/main.yml b/ansible/roles/ansible-vvp-bootstrap/tasks/main.yml
index 48b545e..48b545e 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/tasks/main.yml
+++ b/ansible/roles/ansible-vvp-bootstrap/tasks/main.yml
diff --git a/ansible/roles/ansible-vvp-bootstrap/tasks/matchbox.yml b/ansible/roles/ansible-vvp-bootstrap/tasks/matchbox.yml
index 7e4ea87..7e4ea87 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/tasks/matchbox.yml
+++ b/ansible/roles/ansible-vvp-bootstrap/tasks/matchbox.yml
diff --git a/ansible/roles/ansible-vvp-bootstrap/tasks/tls.yml b/ansible/roles/ansible-vvp-bootstrap/tasks/tls.yml
index e0346cf..e0346cf 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/tasks/tls.yml
+++ b/ansible/roles/ansible-vvp-bootstrap/tasks/tls.yml
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/dnsmasq.conf.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/dnsmasq.conf.j2
index 2908165..2908165 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/dnsmasq.conf.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/dnsmasq.conf.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/groups/group.json.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/groups/group.json.j2
index f7faa70..f7faa70 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/groups/group.json.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/groups/group.json.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/groups/install.json.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/groups/install.json.j2
index bf9284f..bf9284f 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/groups/install.json.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/groups/install.json.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2
index ff8e0b8..ff8e0b8 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/ignition/controller.yaml.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/ignition/coreos-install.yaml.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/ignition/coreos-install.yaml.j2
index 30cd838..30cd838 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/ignition/coreos-install.yaml.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/ignition/coreos-install.yaml.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/ignition/worker.yaml.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/ignition/worker.yaml.j2
index 701559b..701559b 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/ignition/worker.yaml.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/ignition/worker.yaml.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/kubeconfig.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/kubeconfig.j2
index a8e03bf..a8e03bf 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/kubeconfig.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/kubeconfig.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/openssl.config.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/openssl.config.j2
index 3d44c5b..3d44c5b 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/openssl.config.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/openssl.config.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/profiles/controller.json.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/profiles/controller.json.j2
index 11b8cd0..11b8cd0 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/profiles/controller.json.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/profiles/controller.json.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/profiles/install-reboot.json.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/profiles/install-reboot.json.j2
index ed4d0df..ed4d0df 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/profiles/install-reboot.json.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/profiles/install-reboot.json.j2
diff --git a/ansible/roles/ansible-vvp-bootstrap/templates/profiles/worker.json.j2 b/ansible/roles/ansible-vvp-bootstrap/templates/profiles/worker.json.j2
index 6eb3f24..6eb3f24 100755..100644
--- a/ansible/roles/ansible-vvp-bootstrap/templates/profiles/worker.json.j2
+++ b/ansible/roles/ansible-vvp-bootstrap/templates/profiles/worker.json.j2
diff --git a/ansible/simple-deploy.yml b/ansible/simple-deploy.yml
index 6d43884..6d43884 100755..100644
--- a/ansible/simple-deploy.yml
+++ b/ansible/simple-deploy.yml