tripleo: update quickstart env files to make it work again

safchain · safchain · commit 6628f9f58b6a · 2018-08-01T14:19:25.000+02:00
diff --git a/contrib/ansible/roles/skydive_agent/tasks/config.yml b/contrib/ansible/roles/skydive_agent/tasks/config.yml
@@ -35,4 +35,6 @@
           value: "{{ skydive_os_service_password }}"
         - key: "agent.topology.neutron.endpoint_type"
           value: "{{ skydive_os_service_endpoint_type }}"
+        - key: "agent.topology.neutron.ssl_insecure"
+          value: "{{ skydive_os_service_insecure }}"
     state: present
diff --git a/contrib/ansible/roles/skydive_analyzer/defaults/main.yml b/contrib/ansible/roles/skydive_analyzer/defaults/main.yml
@@ -31,4 +31,5 @@ skydive_os_auth_url:
 
 skydive_auth_os_tenant_name: skydive
 skydive_auth_os_domain_name: Default
+skydive_auth_os_domain_id: default
 skydive_auth_os_user_role: admin
diff --git a/contrib/ansible/roles/skydive_analyzer/tasks/config.yml b/contrib/ansible/roles/skydive_analyzer/tasks/config.yml
@@ -87,6 +87,17 @@
     state: present
   when: skydive_cluster_username is not none
 
+- name: Define cluster auth users
+  yedit:
+    src: "{{ skydive_config_file }}"
+    edits:
+        - key: "auth.cluster.type"
+          value: "basic"
+        - key: "auth.cluster.users.{{ skydive_cluster_username }}"
+          value: "{{ skydive_cluster_password }}"
+    state: present
+  when: skydive_cluster_username is not none
+
 - name: Define API auth backend
   yedit:
     src: "{{ skydive_config_file }}"
@@ -96,7 +107,7 @@
     state: present
   when: skydive_auth_type is not none
 
-- name: Define API basic auth parameters
+- name: Define API basic auth users file
   yedit:
     src: "{{ skydive_config_file }}"
     edits:
@@ -107,7 +118,7 @@
     state: present
   when: skydive_auth_type == "basic"
 
-- name: Create API basic auth secret file
+- name: Create API basic auth users file
   htpasswd:
     path: "{{ skydive_basic_auth_file }}"
     name: "{{ skydive_username }}"
@@ -117,7 +128,7 @@
     mode: 0640
   when: skydive_auth_type == "basic"
 
-- name: Define API keystone auth parameters
+- name: Define API keystone user authentication parameters
   yedit:
     src: "{{ skydive_config_file }}"
     edits:
diff --git a/contrib/ansible/roles/skydive_analyzer/tasks/keystone.yml b/contrib/ansible/roles/skydive_analyzer/tasks/keystone.yml
@@ -11,14 +11,30 @@
     state: present
   when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
+- name: Create a Skydive tenant
+  environment:
+    OS_AUTH_URL: "{{ os_auth_url }}"
+    OS_USERNAME: "{{ os_username }}"
+    OS_PASSWORD: "{{ os_password }}"
+    OS_PROJECT_NAME: "{{ os_tenant_name }}"
+    OS_USER_DOMAIN_NAME: "{{ os_user_domain_name }}"
+    OS_PROJECT_DOMAIN_NAME: "{{ os_project_domain_name }}"
+    OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
+  os_project:
+    name: "{{ skydive_auth_os_tenant_name }}"
+    description: "Skydive admin users"
+    domain_id: "{{ skydive_auth_os_domain_id }}"
+    enabled: True
+    state: present
+
 - name: Create a Skydive keystone API user
   environment:
     OS_AUTH_URL: "{{ os_auth_url }}"
     OS_USERNAME: "{{ os_username }}"
     OS_PASSWORD: "{{ os_password }}"
     OS_PROJECT_NAME: "{{ os_tenant_name }}"
-    OS_USER_DOMAIN_NAME: "{{ OS_USER_DOMAIN_NAME }}"
-    OS_PROJECT_DOMAIN_NAME: "{{ OS_PROJECT_DOMAIN_NAME }}"
+    OS_USER_DOMAIN_NAME: "{{ os_user_domain_name }}"
+    OS_PROJECT_DOMAIN_NAME: "{{ os_project_domain_name }}"
     OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
   os_user:
     name: "{{ skydive_username }}"
@@ -33,8 +49,8 @@
     OS_USERNAME: "{{ os_username }}"
     OS_PASSWORD: "{{ os_password }}"
     OS_PROJECT_NAME: "{{ os_tenant_name }}"
-    OS_USER_DOMAIN_NAME: "{{ OS_USER_DOMAIN_NAME }}"
-    OS_PROJECT_DOMAIN_NAME: "{{ OS_PROJECT_DOMAIN_NAME }}"
+    OS_USER_DOMAIN_NAME: "{{ os_user_domain_name }}"
+    OS_PROJECT_DOMAIN_NAME: "{{ os_project_domain_name }}"
     OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
   os_user_role:
     user: "{{ skydive_username }}"
@@ -48,8 +64,8 @@
     OS_USERNAME: "{{ os_username }}"
     OS_PASSWORD: "{{ os_password }}"
     OS_PROJECT_NAME: "{{ os_tenant_name }}"
-    OS_USER_DOMAIN_NAME: "{{ OS_USER_DOMAIN_NAME }}"
-    OS_PROJECT_DOMAIN_NAME: "{{ OS_PROJECT_DOMAIN_NAME }}"
+    OS_USER_DOMAIN_NAME: "{{ os_user_domain_name }}"
+    OS_PROJECT_DOMAIN_NAME: "{{ os_project_domain_name }}"
     OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
   os_user:
     name: "{{ skydive_os_service_username }}"
@@ -64,8 +80,8 @@
     OS_USERNAME: "{{ os_username }}"
     OS_PASSWORD: "{{ os_password }}"
     OS_PROJECT_NAME: "{{ os_tenant_name }}"
-    OS_USER_DOMAIN_NAME: "{{ OS_USER_DOMAIN_NAME }}"
-    OS_PROJECT_DOMAIN_NAME: "{{ OS_PROJECT_DOMAIN_NAME }}"
+    OS_USER_DOMAIN_NAME: "{{ os_user_domain_name }}"
+    OS_PROJECT_DOMAIN_NAME: "{{ os_project_domain_name }}"
     OS_IDENTITY_API_VERSION: "{{ os_identity_api_version }}"
   os_user_role:
     user: "{{ skydive_os_service_username }}"
diff --git a/contrib/ansible/roles/skydive_analyzer/tasks/main.yml b/contrib/ansible/roles/skydive_analyzer/tasks/main.yml
@@ -26,6 +26,11 @@
   tags:
     - config
 
+- include: keystone.yml
+  when: skydive_auth_type == "keystone"
+  tags:
+    - keystone
+
 - include: docker.yml
   when: skydive_deployment_mode == "container"
 
@@ -35,7 +40,4 @@
 - include: binary.yml
   when: skydive_deployment_mode == "binary"
 
-- include: keystone.yml
-  when: skydive_auth_type == "keystone"
-
 - include: tests.yml
diff --git a/contrib/ansible/roles/skydive_analyzer/tasks/tests.yml b/contrib/ansible/roles/skydive_analyzer/tasks/tests.yml
@@ -1,3 +1,4 @@
+---
 - name: Check API status, retrieve token from login page
   uri:
     url: "http://{{ analyzers.split(',')[0] }}/login"
diff --git a/contrib/ansible/roles/skydive_common/defaults/main.yml b/contrib/ansible/roles/skydive_common/defaults/main.yml
@@ -11,16 +11,17 @@ skydive_agent_port: 8081
 skydive_flow_protocol: udp
 
 skydive_auth_type:
-skydive_username: admin
-skydive_password: skydive
+skydive_username: skydive
+skydive_password: secret
 
 skydive_os_auth_url:
-skydive_os_service_username: skydive
-skydive_os_service_password: skydive
+skydive_os_service_username: skydive.service
+skydive_os_service_password: secret
 skydive_os_service_tenant_name: service
 skydive_os_service_domain_name: Default
 skydive_os_service_region_name: RegionOne
 skydive_os_service_endpoint_type: internal
+skydive_os_service_insecure: true
 
 skydive_cluster_username: skydive
-skydive_cluster_password: skydive
+skydive_cluster_password: secret
diff --git a/contrib/ansible/roles/skydive_common/tasks/config.yml b/contrib/ansible/roles/skydive_common/tasks/config.yml
@@ -9,8 +9,7 @@
     content: ""
     dest: "{{ skydive_config_file }}"
     mode: 0600
-    force: yes
-  run_once: true
+    force: no
 
 - name: Set host ID
   yedit:
@@ -30,28 +29,6 @@
     key: "flow.protocol"
     value: "{{ skydive_flow_protocol }}"
 
-- name: Define cluster auth parameters
-  yedit:
-    src: "{{ skydive_config_file }}"
-    edits:
-        - key: "auth.cluster.type"
-          value: "basic"
-        - key: "auth.cluster.users.{{ skydive_cluster_username }}"
-          value: "{{ skydive_cluster_password }}"
-    state: present
-  when: skydive_cluster_username is not none
-
-- name: Define Keystone parameters
-  yedit:
-    src: "{{ skydive_config_file }}"
-    edits:
-        - key: "auth.analyzer_username"
-          value: "{{ skydive_os_service_username }}"
-        - key: "auth.analyzer_password"
-          value: "{{ skydive_os_service_password }}"
-    state: present
-  when: skydive_auth_type == "keystone"
-
 - name: Set extra config vars
   yedit:
     src: "{{ skydive_config_file }}"
diff --git a/contrib/ansible/roles/skydive_common/tasks/main.yml b/contrib/ansible/roles/skydive_common/tasks/main.yml
@@ -19,12 +19,12 @@
     - config
     - tests
 
+- include: config.yml
+  tags:
+    - config
+
 - include: binary.yml
   when: skydive_deployment_mode == "binary"
 
 - include: package.yml
-  when: skydive_deployment_mode == "package"
-
-- include: config.yml
-  tags:
-    - config
+  when: skydive_deployment_mode == "package"
diff --git a/scripts/ci/run-tripleo-tests.sh b/scripts/ci/run-tripleo-tests.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set +x
 set -e
 
 SKYDIVE_PATH=$PWD
@@ -10,7 +9,6 @@ make static
 popd
 
 QUICKSTART=${QUICKSTART:-/tmp/tripleo-quickstart}
-NODES=${NODE:-$QUICKSTART/config/nodes/1ctlr_1comp.yml}
 CONFIG=${CONFIG:-$SKYDIVE_PATH/scripts/ci/tripleo-quickstart/minimal.yml}
 VHOST=${VHOST:-127.0.0.2}
 SKYDIVE_CONFIG=${SKYDIVE_CONFIG:-scripts/ci/tripleo-quickstart/skydive-minimal.yaml}
@@ -22,25 +20,30 @@ git clone https://github.com/openstack/tripleo-quickstart.git /tmp/tripleo-quick
 sed -i -e 's/retries = 3/retries = 10/' /tmp/tripleo-quickstart/ansible.cfg
 
 pushd $QUICKSTART
+
+# because of this https://review.openstack.org/#/c/587384
+git checkout 37c7361faaf25a45e82bd9d9cc38339998cc0e1f
+
 bash quickstart.sh -R master --no-clone --tags all \
 	--requirements quickstart-extras-requirements.txt \
-	--nodes $NODES --config $CONFIG -p quickstart.yml $VHOST
+	--config $CONFIG \
+	-p quickstart.yml $VHOST
 
-bash quickstart.sh -R master --no-clone --tags all --nodes $NODES \
-        --config $CONFIG \
+bash quickstart.sh -R master --no-clone --tags all \
+	--config $CONFIG \
 	-I --teardown none -p quickstart-extras-undercloud.yml $VHOST
 popd
 
 scp -F ~/.quickstart/ssh.config.ansible -r ../skydive undercloud:skydive.git
 
 scp -F ~/.quickstart/ssh.config.ansible -r ${GOPATH}/bin/skydive undercloud:
 
-ssh -F ~/.quickstart/ssh.config.ansible undercloud "sudo ln -s /home/stack/skydive.git/contrib/ansible /usr/share/skydive-ansible"
+ssh -F ~/.quickstart/ssh.config.ansible undercloud "sudo cp -R /home/stack/skydive.git/contrib/ansible /usr/share/ansible/skydive-ansible"
 
 scp -F ~/.quickstart/ssh.config.ansible $SKYDIVE_CONFIG undercloud:skydive.yaml
 
 pushd $QUICKSTART
-bash quickstart.sh -R master --no-clone --tags all --nodes $NODES \
+bash quickstart.sh -R master --no-clone --tags all \
 	--config $CONFIG \
 	-I --teardown none -p quickstart-extras-overcloud-prep.yml $VHOST
 
@@ -49,25 +52,32 @@ REGISTRY=$(grep push_destination containers-prepare-parameter.yaml | head -n 1 |
 
 sudo iptables -I INPUT -p tcp --dport 18888 -j ACCEPT
 python -m SimpleHTTPServer 18888 &
+HTTP_SERVER=$!
+
+ADDRESS=$(ifconfig docker0 | awk '/inet /{print $2}')
 
 rm -rf kolla
 git clone https://github.com/openstack/kolla
 
 pushd kolla
-sed -i "s|https://github.com/skydive-project/skydive/releases/download/\(.*\)/skydive|http://172.17.0.1:18888/skydive|" docker/skydive/skydive-base/Dockerfile.j2
-tools/build.py --registry $REGISTRY --push -b centos skydive-agent --tag devel
-tools/build.py --registry $REGISTRY --push -b centos skydive-analyzer --tag devel
+sed -i "s|https://github.com/skydive-project/skydive/releases/download/\(.*\)/skydive|http://$ADDRESS:18888/skydive|" docker/skydive/skydive-base/Dockerfile.j2
+tools/build.py --registry $REGISTRY --push -b centos skydive-agent --tag devel --network_mode host --nocache
+tools/build.py --registry $REGISTRY --push -b centos skydive-analyzer --tag devel --network_mode host --nocache
 popd
 
-echo "  DockerSkydiveAnalyzerImage: $REGISTRY/kolla/centos-binary-skydive-agent" >> skydive.yaml
-echo "  DockerSkydiveAgentImage: $REGISTRY/kolla/centos-binary-skydive-agent" >> skydive.yaml
+echo "Kolla docker images pushed"
+
+echo "  SkydiveAnsiblePlaybook: /usr/share/ansible/skydive-ansible/playbook.yml.sample" >> skydive.yaml
 
-exit
+echo "  DockerSkydiveAnalyzerImage: $REGISTRY/kolla/centos-binary-skydive-agent:devel" >> skydive.yaml
+echo "  DockerSkydiveAgentImage: $REGISTRY/kolla/centos-binary-skydive-agent:devel" >> skydive.yaml
+
+kill $HTTP_SERVER
 EOF
 
-bash quickstart.sh -R master --no-clone --tags all --nodes $NODES \
+bash quickstart.sh -R master --no-clone --tags all \
 	--config $CONFIG \
 	-I --teardown none -p quickstart-extras-overcloud.yml $VHOST
 popd
 
-ssh -F ~/.quickstart/ssh.config.ansible undercloud "bash -x skydive.git/scripts/ci/tripleo-tests.sh"
+ssh -F ~/.quickstart/ssh.config.ansible undercloud "bash -x skydive.git/scripts/ci/tripleo-tests.sh"
diff --git a/scripts/ci/tripleo-quickstart/minimal.yml b/scripts/ci/tripleo-quickstart/minimal.yml
@@ -5,14 +5,11 @@
 # Deploy an Openstack environment with ssl undercloud, introspect, and use network isolation
 # Note: any change in this featureset must also be done in featureset035.
 
-overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates"
-overcloud_templates_repo: https://github.com/openstack/tripleo-heat-templates
-overcloud_templates_branch: master
-
 # This enables TLS for the undercloud which will also make haproxy bind to the
 # configured public-vip and admin-vip.
 undercloud_generate_service_certificate: true
 ssl_overcloud: true
+overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 step_introspect: true
 
 # This enables container deployements after Pike
@@ -38,11 +35,10 @@ telemetry_args: >-
    {% endif %}
 
 extra_args: >-
-  --ntp-server pool.ntp.org
-  {% if release not in ['newton', 'ocata', 'pike'] %}
-  -e {{ working_dir }}/skydive.yaml
-  -e {{ working_dir }}/tripleo-heat-templates/environments/services/skydive-environment.yaml
-  {% endif %}
+   {% if release not in ['newton', 'ocata', 'pike'] %}
+   -e {{ overcloud_templates_path }}/environments/services/skydive-environment.yaml
+   -e {{ working_dir }}/skydive.yaml
+   {% endif %}
 
 # keep the doc gen settings at the bottom of the config file.
 # options below direct automatic doc generation by tripleo-collect-logs
@@ -68,3 +64,9 @@ deploy_steps_ansible_workflow: >-
   {%- else -%}
   false
   {%- endif -%}
+config_download_args: >-
+  {% if release in ['queens'] -%}
+  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
+  --config-download
+  --verbose
+  {%- endif -%}
diff --git a/scripts/ci/tripleo-quickstart/skydive-minimal.yaml b/scripts/ci/tripleo-quickstart/skydive-minimal.yaml
diff --git a/scripts/ci/tripleo-tests.sh b/scripts/ci/tripleo-tests.sh

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`- name: Check API status, retrieve token from login page`
`2`	`3`	`uri:`
`3`	`4`	`url: "http://{{ analyzers.split(',')[0] }}/login"`