diff options
| -rw-r--r-- | jjb/cperf/cperf-ci-jobs.yml | 9 | ||||
| -rw-r--r-- | jjb/joid/joid-daily-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/qtip/qtip-validate-jobs.yml | 24 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 3 | ||||
| -rw-r--r-- | prototypes/openstack-ansible/file/openstack_user_config.yml | 78 | ||||
| -rw-r--r-- | prototypes/openstack-ansible/file/user_variables.yml | 10 | ||||
| -rw-r--r-- | prototypes/openstack-ansible/playbooks/jumphost_configuration.yml | 80 | ||||
| -rw-r--r-- | prototypes/openstack-ansible/playbooks/targethost_configuration.yml | 60 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/creds/clouds.yaml | 1 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/hiera/common.yaml | 1 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/hiera/common_baremetal.yaml | 9 |
11 files changed, 142 insertions, 137 deletions
diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml index d1914f6f1..2742f08f7 100644 --- a/jjb/cperf/cperf-ci-jobs.yml +++ b/jjb/cperf/cperf-ci-jobs.yml @@ -13,6 +13,11 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' + danube: &danube + stream: danube + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + docker-tag: 'stable' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING @@ -24,7 +29,9 @@ - intel-pod2: installer: apex <<: *master - + - intel-pod2: + installer: apex + <<: *danube #-------------------------------- testsuite: diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index 97e290c8a..8c69c8310 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -64,13 +64,13 @@ - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-onos-nofeature-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'daily-trigger-disabled' - 'os-odl_l2-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' - 'os-onos-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' - 'os-onos-sfc-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-ha': auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-noha': diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index deaf525af..a850d6757 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -59,13 +59,19 @@ name: 'qtip-{task}-{installer}-{pod}-{stream}' disabled: false parameters: - - qtip-common-parameters: + - project-parameter: project: '{project}' branch: '{branch}' - docker-tag: '{docker-tag}' - '{installer}-defaults' - '{pod}-defaults' - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull docker image' + - string: name: CI_DEBUG default: 'false' description: "Show debug output information" @@ -110,20 +116,6 @@ # parameter #----------- -- parameter: - name: qtip-common-parameters - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull docker image' - #----------- # publisher #----------- diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index f69992156..3b7ec3478 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -53,6 +53,9 @@ - 'functest': <<: *danube <<: *functest-receivers + - 'qtip': + <<: *danube + <<: *other-receivers - 'storperf': <<: *danube <<: *other-receivers diff --git a/prototypes/openstack-ansible/file/openstack_user_config.yml b/prototypes/openstack-ansible/file/openstack_user_config.yml index 2811e62ce..43e88c0d0 100644 --- a/prototypes/openstack-ansible/file/openstack_user_config.yml +++ b/prototypes/openstack-ansible/file/openstack_user_config.yml @@ -67,9 +67,9 @@ global_overrides: - cinder_volume - nova_compute -### -### Infrastructure -### +# ## +# ## Infrastructure +# ## # galera, memcache, rabbitmq, utility shared-infra_hosts: @@ -101,13 +101,13 @@ haproxy_hosts: ip: 172.29.236.13 # rsyslog server -#log_hosts: - # log1: - # ip: 172.29.236.14 +# log_hosts: +# log1: +# ip: 172.29.236.14 -### -### OpenStack -### +# ## +# ## OpenStack +# ## # keystone identity_hosts: @@ -133,36 +133,36 @@ storage-infra_hosts: # user_variables, but are left here to illustrate that # each container could have different storage targets. image_hosts: - controller00: - ip: 172.29.236.11 - container_vars: - limit_container_types: glance - glance_nfs_client: - - server: "172.29.244.15" - remote_path: "/images" - local_path: "/var/lib/glance/images" - type: "nfs" - options: "_netdev,auto" - controller01: - ip: 172.29.236.12 - container_vars: - limit_container_types: glance - glance_nfs_client: - - server: "172.29.244.15" - remote_path: "/images" - local_path: "/var/lib/glance/images" - type: "nfs" - options: "_netdev,auto" - controller02: - ip: 172.29.236.13 - container_vars: - limit_container_types: glance - glance_nfs_client: - - server: "172.29.244.15" - remote_path: "/images" - local_path: "/var/lib/glance/images" - type: "nfs" - options: "_netdev,auto" + controller00: + ip: 172.29.236.11 + container_vars: + limit_container_types: glance + glance_nfs_client: + - server: "172.29.244.15" + remote_path: "/images" + local_path: "/var/lib/glance/images" + type: "nfs" + options: "_netdev,auto" + controller01: + ip: 172.29.236.12 + container_vars: + limit_container_types: glance + glance_nfs_client: + - server: "172.29.244.15" + remote_path: "/images" + local_path: "/var/lib/glance/images" + type: "nfs" + options: "_netdev,auto" + controller02: + ip: 172.29.236.13 + container_vars: + limit_container_types: glance + glance_nfs_client: + - server: "172.29.244.15" + remote_path: "/images" + local_path: "/var/lib/glance/images" + type: "nfs" + options: "_netdev,auto" # nova api, conductor, etc services compute-infra_hosts: diff --git a/prototypes/openstack-ansible/file/user_variables.yml b/prototypes/openstack-ansible/file/user_variables.yml index 3e14bc57e..65cbcc11b 100644 --- a/prototypes/openstack-ansible/file/user_variables.yml +++ b/prototypes/openstack-ansible/file/user_variables.yml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -### -### This file contains commonly used overrides for convenience. Please inspect -### the defaults for each role to find additional override options. -### +# ## +# ## This file contains commonly used overrides for convenience. Please inspect +# ## the defaults for each role to find additional override options. +# ## -## Debug and Verbose options. +# # Debug and Verbose options. debug: false haproxy_keepalived_external_vip_cidr: "192.168.122.220/32" diff --git a/prototypes/openstack-ansible/playbooks/jumphost_configuration.yml b/prototypes/openstack-ansible/playbooks/jumphost_configuration.yml index c51d83073..74e97cdd5 100644 --- a/prototypes/openstack-ansible/playbooks/jumphost_configuration.yml +++ b/prototypes/openstack-ansible/playbooks/jumphost_configuration.yml @@ -4,44 +4,44 @@ vars_files: - ../var/ubuntu.yml tasks: - - name: generate SSH keys - shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N "" - args: - creates: /root/.ssh/id_rsa - - name: fetch public key - fetch: src="/root/.ssh/id_rsa.pub" dest="/" - - name: remove the directory - shell: "rm -rf {{OSA_PATH}} {{OSA_ETC_PATH}}" - - name: git openstack ansible - shell: "git clone {{OSA_URL}} {{OSA_PATH}} -b {{OSA_BRANCH}}" - - name: copy /opt/openstack-ansible/etc/openstack_deploy to /etc/openstack_deploy - shell: "/bin/cp -rf {{OSA_PATH}}/etc/openstack_deploy {{OSA_ETC_PATH}}" - - name: bootstrap - command: "/bin/bash ./scripts/bootstrap-ansible.sh" - args: - chdir: "{{OSA_PATH}}" - - name: generate password token - command: "python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml" - args: - chdir: /opt/openstack-ansible/scripts/ - - name: copy openstack_user_config.yml to /etc/openstack_deploy - copy: - src: ../file/openstack_user_config.yml - dest: "{{OSA_ETC_PATH}}/openstack_user_config.yml" - - name: copy cinder.yml to /etc/openstack_deploy/env.d - copy: - src: ../file/cinder.yml - dest: "{{OSA_ETC_PATH}}/env.d/cinder.yml" - - name: copy user_variables.yml to /etc/openstack_deploy/ - copy: - src: ../file/user_variables.yml - dest: "{{OSA_ETC_PATH}}/user_variables.yml" - - name: configure network - template: - src: ../template/bifrost/controller.interface.j2 - dest: /etc/network/interfaces - notify: - - restart network service + - name: generate SSH keys + shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N "" + args: + creates: /root/.ssh/id_rsa + - name: fetch public key + fetch: src="/root/.ssh/id_rsa.pub" dest="/" + - name: remove the directory + shell: "rm -rf {{OSA_PATH}} {{OSA_ETC_PATH}}" + - name: git openstack ansible + shell: "git clone {{OSA_URL}} {{OSA_PATH}} -b {{OSA_BRANCH}}" + - name: copy /opt/openstack-ansible/etc/openstack_deploy to /etc/openstack_deploy + shell: "/bin/cp -rf {{OSA_PATH}}/etc/openstack_deploy {{OSA_ETC_PATH}}" + - name: bootstrap + command: "/bin/bash ./scripts/bootstrap-ansible.sh" + args: + chdir: "{{OSA_PATH}}" + - name: generate password token + command: "python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml" + args: + chdir: /opt/openstack-ansible/scripts/ + - name: copy openstack_user_config.yml to /etc/openstack_deploy + copy: + src: ../file/openstack_user_config.yml + dest: "{{OSA_ETC_PATH}}/openstack_user_config.yml" + - name: copy cinder.yml to /etc/openstack_deploy/env.d + copy: + src: ../file/cinder.yml + dest: "{{OSA_ETC_PATH}}/env.d/cinder.yml" + - name: copy user_variables.yml to /etc/openstack_deploy/ + copy: + src: ../file/user_variables.yml + dest: "{{OSA_ETC_PATH}}/user_variables.yml" + - name: configure network + template: + src: ../template/bifrost/controller.interface.j2 + dest: /etc/network/interfaces + notify: + - restart network service handlers: - name: restart network service shell: "/sbin/ifconfig ens3 0 &&/sbin/ifdown -a && /sbin/ifup -a" @@ -49,5 +49,5 @@ - hosts: localhost remote_user: root tasks: - - name: Generate authorized_keys - shell: "/bin/cat /jumphost/root/.ssh/id_rsa.pub >> ../file/authorized_keys" + - name: Generate authorized_keys + shell: "/bin/cat /jumphost/root/.ssh/id_rsa.pub >> ../file/authorized_keys" diff --git a/prototypes/openstack-ansible/playbooks/targethost_configuration.yml b/prototypes/openstack-ansible/playbooks/targethost_configuration.yml index ffe788f0e..1f4ad063e 100644 --- a/prototypes/openstack-ansible/playbooks/targethost_configuration.yml +++ b/prototypes/openstack-ansible/playbooks/targethost_configuration.yml @@ -4,26 +4,26 @@ vars_files: - ../var/ubuntu.yml tasks: - - name: add public key to host - copy: - src: ../file/authorized_keys - dest: /root/.ssh/authorized_keys - - name: configure modules - copy: - src: ../file/modules - dest: /etc/modules + - name: add public key to host + copy: + src: ../file/authorized_keys + dest: /root/.ssh/authorized_keys + - name: configure modules + copy: + src: ../file/modules + dest: /etc/modules - hosts: controller remote_user: root vars_files: - ../var/ubuntu.yml tasks: - - name: configure network - template: - src: ../template/bifrost/controller.interface.j2 - dest: /etc/network/interfaces - notify: - - restart network service + - name: configure network + template: + src: ../template/bifrost/controller.interface.j2 + dest: /etc/network/interfaces + notify: + - restart network service handlers: - name: restart network service shell: "/sbin/ifconfig ens3 0 &&/sbin/ifdown -a && /sbin/ifup -a" @@ -33,12 +33,12 @@ vars_files: - ../var/ubuntu.yml tasks: - - name: configure network - template: - src: ../template/bifrost/compute.interface.j2 - dest: /etc/network/interfaces - notify: - - restart network service + - name: configure network + template: + src: ../template/bifrost/compute.interface.j2 + dest: /etc/network/interfaces + notify: + - restart network service handlers: - name: restart network service shell: "/sbin/ifconfig ens3 0 &&/sbin/ifdown -a && /sbin/ifup -a" @@ -46,16 +46,16 @@ - hosts: compute01 remote_user: root tasks: - - name: make nfs dir - file: "dest=/images mode=777 state=directory" - - name: configure sdrvice - shell: "echo 'nfs 2049/tcp' >> /etc/services && echo 'nfs 2049/udp' >> /etc/services" - - name: configure NFS - copy: - src: ../file/exports - dest: /etc/exports - notify: - - restart nfs service + - name: make nfs dir + file: "dest=/images mode=777 state=directory" + - name: configure sdrvice + shell: "echo 'nfs 2049/tcp' >> /etc/services && echo 'nfs 2049/udp' >> /etc/services" + - name: configure NFS + copy: + src: ../file/exports + dest: /etc/exports + notify: + - restart nfs service handlers: - name: restart nfs service service: name=nfs-kernel-server state=restarted diff --git a/prototypes/puppet-infracloud/creds/clouds.yaml b/prototypes/puppet-infracloud/creds/clouds.yaml index eb44db66c..cc27da28a 100644 --- a/prototypes/puppet-infracloud/creds/clouds.yaml +++ b/prototypes/puppet-infracloud/creds/clouds.yaml @@ -1,3 +1,4 @@ +--- clouds: opnfv: verify: False diff --git a/prototypes/puppet-infracloud/hiera/common.yaml b/prototypes/puppet-infracloud/hiera/common.yaml index 1943f660b..634d96cb5 100644 --- a/prototypes/puppet-infracloud/hiera/common.yaml +++ b/prototypes/puppet-infracloud/hiera/common.yaml @@ -1,3 +1,4 @@ +--- keystone_rabbit_password: pass neutron_rabbit_password: pass nova_rabbit_password: pass diff --git a/prototypes/puppet-infracloud/hiera/common_baremetal.yaml b/prototypes/puppet-infracloud/hiera/common_baremetal.yaml index a8d69a05d..015612c99 100644 --- a/prototypes/puppet-infracloud/hiera/common_baremetal.yaml +++ b/prototypes/puppet-infracloud/hiera/common_baremetal.yaml @@ -1,3 +1,4 @@ +--- keystone_rabbit_password: pass neutron_rabbit_password: pass nova_rabbit_password: pass @@ -134,8 +135,8 @@ ironic_inventory: ipv4_subnet_mask: 255.255.255.192 name: controller00.opnfvlocal nics: - - mac: a4:bf:01:01:a9:fc - - mac: 00:1e:67:f6:9b:35 + - mac: a4:bf:01:01:a9:fc + - mac: 00:1e:67:f6:9b:35 properties: cpu_arch: x86_64 cpus: '44' @@ -156,8 +157,8 @@ ironic_inventory: ipv4_subnet_mask: 255.255.255.0 name: compute00.opnfvlocal nics: - - mac: a4:bf:01:01:a9:d4 - - mac: 00:1e:67:f6:9b:37 + - mac: a4:bf:01:01:a9:d4 + - mac: 00:1e:67:f6:9b:37 properties: cpu_arch: x86_64 cpus: '44' |