diff options
| author |   edan.binshtok <eb578m@intl.att.com> | 2017-11-21 13:36:53 +0200 |
|---|---|---|
| committer | edan.binshtok <eb578m@intl.att.com> | 2017-11-21 13:39:44 +0200 |
| commit | eb123edb162afc20da8d618df1e77d73b8236f6d (patch) | |
| tree | 1adcd09b52f31c905f5c58c9f3a5b322b7b166d2 | |
| parent | f52ddcb67f75aeb6bd72fecfd4a133ae1eb56666 (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>
52 files changed, 39 insertions, 10 deletions
diff --git a/LICENSE.TXT b/LICENSE.TXT index 19fa261..42789d5 100755..100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -# ============LICENSE_START======================================================= +# ============LICENSE_START========================================== # org.onap.vvp/engagementmgr # =================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. @@ -35,4 +35,4 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property.
\ No newline at end of file +# ECOMP is a trademark and service mark of AT&T Intellectual Property. diff --git a/README.md b/README.md index 5474595..5474595 100755..100644 --- a/README.md +++ b/README.md 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 Binary files differindex ccda67b..ccda67b 100755..100644 --- a/ansible/roles/ansible-vvp-bootstrap/files/iceundionly.kpxe +++ b/ansible/roles/ansible-vvp-bootstrap/files/iceundionly.kpxe 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 diff --git a/boxes/vvp-empty/0.0.0/virtualbox/Vagrantfile b/boxes/vvp-empty/0.0.0/virtualbox/Vagrantfile index 0e079f8..0e079f8 100755..100644 --- a/boxes/vvp-empty/0.0.0/virtualbox/Vagrantfile +++ b/boxes/vvp-empty/0.0.0/virtualbox/Vagrantfile diff --git a/boxes/vvp-empty/0.0.0/virtualbox/base_mac.rb b/boxes/vvp-empty/0.0.0/virtualbox/base_mac.rb index 6877374..6877374 100755..100644 --- a/boxes/vvp-empty/0.0.0/virtualbox/base_mac.rb +++ b/boxes/vvp-empty/0.0.0/virtualbox/base_mac.rb diff --git a/boxes/vvp-empty/0.0.0/virtualbox/box.ovf b/boxes/vvp-empty/0.0.0/virtualbox/box.ovf index 1cbc01e..1cbc01e 100755..100644 --- a/boxes/vvp-empty/0.0.0/virtualbox/box.ovf +++ b/boxes/vvp-empty/0.0.0/virtualbox/box.ovf diff --git a/boxes/vvp-empty/0.0.0/virtualbox/change_host_name.rb b/boxes/vvp-empty/0.0.0/virtualbox/change_host_name.rb index d8d81ad..d8d81ad 100755..100644 --- a/boxes/vvp-empty/0.0.0/virtualbox/change_host_name.rb +++ b/boxes/vvp-empty/0.0.0/virtualbox/change_host_name.rb diff --git a/boxes/vvp-empty/0.0.0/virtualbox/configure_networks.rb b/boxes/vvp-empty/0.0.0/virtualbox/configure_networks.rb index dc81ea3..dc81ea3 100755..100644 --- a/boxes/vvp-empty/0.0.0/virtualbox/configure_networks.rb +++ b/boxes/vvp-empty/0.0.0/virtualbox/configure_networks.rb diff --git a/boxes/vvp-empty/0.0.0/virtualbox/files/intel--virtio-net--pcnet32.isarom b/boxes/vvp-empty/0.0.0/virtualbox/files/intel--virtio-net--pcnet32.isarom Binary files differindex 945bb35..945bb35 100755..100644 --- a/boxes/vvp-empty/0.0.0/virtualbox/files/intel--virtio-net--pcnet32.isarom +++ b/boxes/vvp-empty/0.0.0/virtualbox/files/intel--virtio-net--pcnet32.isarom diff --git a/boxes/vvp-empty/0.0.0/virtualbox/metadata.json b/boxes/vvp-empty/0.0.0/virtualbox/metadata.json index 4fc99bd..4fc99bd 100755..100644 --- a/boxes/vvp-empty/0.0.0/virtualbox/metadata.json +++ b/boxes/vvp-empty/0.0.0/virtualbox/metadata.json diff --git a/examples/unencrypted_vault.yml b/examples/unencrypted_vault.yml index d7275ab..d7275ab 100755..100644 --- a/examples/unencrypted_vault.yml +++ b/examples/unencrypted_vault.yml @@ -40,8 +40,10 @@ pushd $(dirname $BASH_SOURCE[0]) > /dev/null export DEVKIT_DIR=`pwd -P` popd > /dev/null - -# Make sure we have ansible installed +export DEVKIT_DIR=`pwd -P` +echo $DEVKIT_DIR +echo "DEVKIT DIR ^^" +echo "# Make sure we have ansible installed" REQUIREMENTS="ansible vagrant" for req in $REQUIREMENTS do @@ -52,13 +54,13 @@ do fi done -# Make sure we have the vvp-empty box installed +echo "# Make sure we have the vvp-empty box installed" if [[ -z $(vagrant box list | grep vvp-empty) ]] then bin/vvp-install-box fi - -select ENVFILE in `find ./zones/ -name devkit_environment_*`; +echo "# Create ENV vars" +select ENVFILE in `find ./zones/ -name "devkit_environment_*"`; do source $ENVFILE break @@ -66,6 +68,7 @@ done # Grab ansible requirements echo "Installing devkit's required ansible roles" +echo $DEVKIT_DIR ansible-galaxy install -r ${DEVKIT_DIR}/ansible/requirements.yml echo "Devkit zone setup complete" @@ -0,0 +1,24 @@ +[tox] +skipsdist=True +envlist =style-flake8, style-yamllint +setupdir = devkit/ + +[testenv] +distribute = False +deps = flake8 + yamllint == 1.7.0 + +[testenv:style-flake8] +basepython=python3.6 +commands = flake8 + python --version + +[testenv:style-yamllint] +basepython=python2.7 +commands = python --version + yamllint {toxinidir}/ansible + + +[flake8] +show-source = True +exclude=venv-tox,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build diff --git a/vagrant/prebuilt/Vagrantfile b/vagrant/prebuilt/Vagrantfile index f771763..f771763 100755..100644 --- a/vagrant/prebuilt/Vagrantfile +++ b/vagrant/prebuilt/Vagrantfile diff --git a/vagrant/prebuilt/config.yml b/vagrant/prebuilt/config.yml index 5cb0ad9..5cb0ad9 100755..100644 --- a/vagrant/prebuilt/config.yml +++ b/vagrant/prebuilt/config.yml diff --git a/vagrant/pxe/Vagrantfile b/vagrant/pxe/Vagrantfile index bd860f9..bd860f9 100755..100644 --- a/vagrant/pxe/Vagrantfile +++ b/vagrant/pxe/Vagrantfile diff --git a/vagrant/pxe/lib/vagrant_provision.rb b/vagrant/pxe/lib/vagrant_provision.rb index 67ccb63..67ccb63 100755..100644 --- a/vagrant/pxe/lib/vagrant_provision.rb +++ b/vagrant/pxe/lib/vagrant_provision.rb diff --git a/vagrant/pxe/multi_node_config.yml b/vagrant/pxe/multi_node_config.yml index 2f92e52..2f92e52 100755..100644 --- a/vagrant/pxe/multi_node_config.yml +++ b/vagrant/pxe/multi_node_config.yml diff --git a/vagrant/pxe/single_node_config.yml b/vagrant/pxe/single_node_config.yml index 17ff408..17ff408 100755..100644 --- a/vagrant/pxe/single_node_config.yml +++ b/vagrant/pxe/single_node_config.yml diff --git a/zones/development/devkit_environment_multi b/zones/development/devkit_environment_multi index a6bde88..a6bde88 100755..100644 --- a/zones/development/devkit_environment_multi +++ b/zones/development/devkit_environment_multi diff --git a/zones/development/devkit_environment_single b/zones/development/devkit_environment_single index 28eef6f..28eef6f 100755..100644 --- a/zones/development/devkit_environment_single +++ b/zones/development/devkit_environment_single diff --git a/zones/development/inventory/group_vars/all/all.yml b/zones/development/inventory/group_vars/all/all.yml index 905d7f6..905d7f6 100755..100644 --- a/zones/development/inventory/group_vars/all/all.yml +++ b/zones/development/inventory/group_vars/all/all.yml diff --git a/zones/development/inventory/group_vars/all/rgws.yml b/zones/development/inventory/group_vars/all/rgws.yml index 5835a49..5835a49 100755..100644 --- a/zones/development/inventory/group_vars/all/rgws.yml +++ b/zones/development/inventory/group_vars/all/rgws.yml diff --git a/zones/development/inventory/group_vars/all/unencrypted_vault.yml b/zones/development/inventory/group_vars/all/unencrypted_vault.yml index d967071..d967071 100755..100644 --- a/zones/development/inventory/group_vars/all/unencrypted_vault.yml +++ b/zones/development/inventory/group_vars/all/unencrypted_vault.yml diff --git a/zones/development/inventory/group_vars/bootstrap.yml b/zones/development/inventory/group_vars/bootstrap.yml index e1b4d77..e1b4d77 100755..100644 --- a/zones/development/inventory/group_vars/bootstrap.yml +++ b/zones/development/inventory/group_vars/bootstrap.yml diff --git a/zones/development/inventory/group_vars/local.yml b/zones/development/inventory/group_vars/local.yml index 5e42769..5e42769 100755..100644 --- a/zones/development/inventory/group_vars/local.yml +++ b/zones/development/inventory/group_vars/local.yml diff --git a/zones/development/inventory/group_vars/mons.yml b/zones/development/inventory/group_vars/mons.yml index a41ca48..a41ca48 100755..100644 --- a/zones/development/inventory/group_vars/mons.yml +++ b/zones/development/inventory/group_vars/mons.yml diff --git a/zones/development/inventory/group_vars/rbdhost.yml b/zones/development/inventory/group_vars/rbdhost.yml index 3ec55e2..3ec55e2 100755..100644 --- a/zones/development/inventory/group_vars/rbdhost.yml +++ b/zones/development/inventory/group_vars/rbdhost.yml diff --git a/zones/development/inventory/inventory b/zones/development/inventory/inventory index fc7eaed..fc7eaed 100755..100644 --- a/zones/development/inventory/inventory +++ b/zones/development/inventory/inventory |