Adds Calipso scenario

Calipso uses docker containers and is post deployment feature that can
be used to monitor pieces of the stack.  This patch installs it to the
undercloud rather than the jumphost as it is easier to manage for
cleanup and dependencies.

Change-Id: Ie2dacc4f14b391a864fafb2e75ebcd15facb19f1
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/apex/deploy.py b/apex/deploy.py
index 9ebc3f6..28416ee 100644 (file)
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -404,6 +404,7 @@ def main():
             deploy_vars['congress'] = True
         else:
             deploy_vars['congress'] = False
+        deploy_vars['calipso'] = ds_opts.get('calipso', False)
         # TODO(trozet): this is probably redundant with getting external
         # network info from undercloud.py
         if 'external' in net_settings.enabled_network_list:

diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py
index 793e43a..35c911b 100644 (file)
--- a/apex/settings/deploy_settings.py
+++ b/apex/settings/deploy_settings.py
@@ -32,7 +32,8 @@ OPT_DEPLOY_SETTINGS = ['performance',
                        'dovetail',
                        'odl_vpp_routing_node',
                        'odl_vpp_netvirt',
-                       'barometer']
+                       'barometer',
+                       'calipso']
 
 VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
 VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs']

diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index c2e2f14..3b0e1aa 100644 (file)
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -69,6 +69,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-bar-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-bar-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-calipso-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-noha.yaml
@@ -112,6 +113,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
+* Wed Sep 20 2017 Tim Rozet <trozet@redhat.com> - 5.0-7
+- Add calipso
 * Fri Sep 08 2017 Tim Rozet <trozet@redhat.com> - 5.0-6
 - Updates clean to use python
 * Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-5

diff --git a/build/undercloud.sh b/build/undercloud.sh
index 05cbf55..d225958 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -26,6 +26,9 @@ popd > /dev/null
 # inject rt_kvm kernel rpm name into the enable file
 sed "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.yaml | tee ${BUILD_DIR}/enable_rt_kvm.yaml
 
+# grab latest calipso
+populate_cache $calipso_uri_base/$calipso_script
+
 # Turn off GSSAPI Auth in sshd
 # installing forked apex-tht
 # enabling ceph OSDs to live on the controller
@@ -52,6 +55,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${BUILD_ROOT}/virtual-environment.yaml:/home/stack/ \
     --upload ${BUILD_ROOT}/baremetal-environment.yaml:/home/stack/ \
     --uninstall "libvirt-client" \
+    --upload ${CACHE_DIR}/${calipso_script}:/root/ \
     --install "libguestfs-tools" \
     -a undercloud_build.qcow2
 

diff --git a/build/variables.sh b/build/variables.sh
index a611073..444c5e8 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -38,6 +38,9 @@ dpdk_rpms=(
 kvmfornfv_uri_base="http://artifacts.opnfv.org/kvmfornfv/danube"
 kvmfornfv_kernel_rpm="kvmfornfv-4bfeded9-apex-kernel-4.4.50_rt62_centos.x86_64.rpm"
 
+calipso_uri_base="https://git.opnfv.org/calipso/plain/app/install"
+calipso_script="calipso-installer.py"
+
 netvpp_repo="https://github.com/openstack/networking-vpp"
 netvpp_branch="master"
 netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}')

diff --git a/config/deploy/os-nosdn-calipso-noha.yaml b/config/deploy/os-nosdn-calipso-noha.yaml
new file mode 100644 (file)
index 0000000..ce5c8a5
--- /dev/null
+++ b/config/deploy/os-nosdn-calipso-noha.yaml
@@ -0,0 +1,9 @@
+---
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: false
+  sfc: false
+  vpn: false
+  calipso: true

diff --git a/lib/ansible/playbooks/post_deploy_undercloud.yml b/lib/ansible/playbooks/post_deploy_undercloud.yml
index d6b8805..a5b8677 100644 (file)
--- a/lib/ansible/playbooks/post_deploy_undercloud.yml
+++ b/lib/ansible/playbooks/post_deploy_undercloud.yml
@@ -115,3 +115,7 @@
       become_user: stack
       when: congress
       with_items: "{{ congress_datasources }}"
+    - name: Install Calipso
+      command: python3 /root/calipso-installer.py --command start-all --copy q
+      become: yes
+      when: calipso