aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml1
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg18
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml26
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml6
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml16
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml26
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network_onos.yml4
-rwxr-xr-xdeploy/prepare.sh41
10 files changed, 70 insertions, 76 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
index c6b1c9ab..ec4c53f4 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
@@ -99,7 +99,6 @@
accelerate: true
max_fail_percentage: 0
roles:
- - swift
- moon
- hosts: all
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
index 66ea7139..c0a0747d 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
@@ -158,15 +158,15 @@ listen proxy-cinder_api_cluster
server {{ host }} {{ ip }}:8776 weight 1 check inter 2000 rise 2 fall 5
{% endfor %}
-listen proxy-swift-proxy
- bind {{ internal_vip.ip }}:8080
- bind {{ public_vip.ip }}:8080
- balance source
- option tcpka
- option tcplog
-{% for host,ip in haproxy_hosts.items() %}
- server {{ host }} {{ ip }}:8080 weight 1 check inter 2000 rise 2 fall 5
-{% endfor %}
+#listen proxy-swift-proxy
+# bind {{ internal_vip.ip }}:8080
+# bind {{ public_vip.ip }}:8080
+# balance source
+# option tcpka
+# option tcplog
+#{% for host,ip in haproxy_hosts.items() %}
+# server {{ host }} {{ ip }}:8080 weight 1 check inter 2000 rise 2 fall 5
+#{% endfor %}
listen proxy-ceilometer_api_cluster
bind {{ internal_vip.ip }}:8777
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml
index 9ce499da..ac548a09 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml
@@ -92,13 +92,13 @@ os_services:
internalurl: "http://{{ internal_vip.ip }}:8000/v1"
adminurl: "http://{{ internal_vip.ip }}:8000/v1"
- - name: swift
- type: object-store
- region: RegionOne
- description: "OpenStack Object Storage"
- publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
- internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
- adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+# - name: swift
+# type: object-store
+# region: RegionOne
+# description: "OpenStack Object Storage"
+# publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+# internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+# adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
os_users:
- user: admin
@@ -171,9 +171,9 @@ os_users:
tenant: demo
tenant_description: "Demo Tenant"
- - user: swift
- password: "{{ CINDER_PASS }}"
- email: swift@admin.com
- role: admin
- tenant: service
- tenant_description: "Service Tenant"
+# - user: swift
+# password: "{{ CINDER_PASS }}"
+# email: swift@admin.com
+# role: admin
+# tenant: service
+# tenant_description: "Service Tenant"
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml
index 9edd22dc..e4142b5f 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml
@@ -15,6 +15,6 @@
with_items:
- nova-compute
-- name: restart swift task
- shell: swift-init all start
- ignore_errors: True
+#- name: restart swift task
+# shell: swift-init all start
+# ignore_errors: True
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
index 62f53ab9..7a507c88 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
@@ -128,7 +128,7 @@
sudo chmod g+rw /var/log/moon/keystonemiddleware.log;
sudo chmod g+rw /var/log/moon/system.log;
sudo adduser keystone moonlog;
- sudo adduser swift moonlog;
+ # sudo adduser swift moonlog;
sudo adduser nova moonlog;
@@ -217,8 +217,8 @@
- name: update api-paste.ini
template: src=api-paste.ini dest=/etc/nova/api-paste.ini backup=yes
-- name: update proxy-server conf
- template: src=proxy-server.conf dest=/etc/swift/proxy-server.conf backup=yes
+#- name: update proxy-server conf
+# template: src=proxy-server.conf dest=/etc/swift/proxy-server.conf backup=yes
# restart nova
- name: restart nova
@@ -231,8 +231,8 @@
- nova-scheduler
# restart swift
-- name: restart swift
- service: name={{ item }} state=restarted enabled=yes
- with_items:
- - swift-proxy
- - memcached
+#- name: restart swift
+# service: name={{ item }} state=restarted enabled=yes
+# with_items:
+# - swift-proxy
+# - memcached
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
index aad55d05..cff8c7c2 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
@@ -92,13 +92,13 @@ os_services:
internalurl: "http://{{ internal_vip.ip }}:8000/v1"
adminurl: "http://{{ internal_vip.ip }}:8000/v1"
- - name: swift
- type: object-store
- region: RegionOne
- description: "OpenStack Object Storage"
- publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
- internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
- adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+# - name: swift
+# type: object-store
+# region: RegionOne
+# description: "OpenStack Object Storage"
+# publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+# internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+# adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
os_users:
- user: admin
@@ -164,9 +164,9 @@ os_users:
tenant: demo
tenant_description: "Demo Tenant"
- - user: swift
- password: "{{ CINDER_PASS }}"
- email: swift@admin.com
- role: admin
- tenant: service
- tenant_description: "Service Tenant"
+# - user: swift
+# password: "{{ CINDER_PASS }}"
+# email: swift@admin.com
+# role: admin
+# tenant: service
+# tenant_description: "Service Tenant"
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network.yml b/deploy/conf/hardware_environment/huawei-pod5/network.yml
index dbaba01c..9d3eea1b 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network.yml
@@ -55,8 +55,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.145.140.100"
- - "10.145.140.105"
+ - - "10.145.140.10"
+ - "10.145.140.50"
cidr: "10.145.140.0/24"
gw: "10.145.140.1"
role:
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
index b15ce35a..8f603de5 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
@@ -55,8 +55,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.145.140.100"
- - "10.145.140.105"
+ - - "10.145.140.10"
+ - "10.145.140.50"
cidr: "10.145.140.0/24"
gw: "10.145.140.1"
role:
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
index 6c543b48..69880200 100644
--- a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
+++ b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
@@ -55,8 +55,8 @@ ip_settings:
- name: external
ip_ranges:
- - - "10.145.140.100"
- - "10.145.140.105"
+ - - "10.145.140.10"
+ - "10.145.140.50"
cidr: "10.145.140.0/24"
gw: "10.145.140.1"
role:
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index 4ce78184..97771b87 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -9,11 +9,6 @@
##############################################################################
function print_logo()
{
-# if ! apt --installed list 2>/dev/null | grep "figlet"
-# then
-# sudo apt-get update -y
-# sudo apt-get install -y --force-yes figlet
-# fi
figlet -ctf slant Compass Installer
set +x; sleep 2; set -x
@@ -83,25 +78,25 @@ function _prepare_python_env() {
sudo apt-get install -y --force-yes libffi-dev libssl-dev
fi
+ fi
+
+ if [[ ! -z "$JHPKG_URL" ]]; then
+ _pre_pip_setup
else
- if [[ ! -z "$JHPKG_URL" ]]; then
- _pre_pip_setup
- else
- sudo pip install --upgrade virtualenv
- virtualenv $WORK_DIR/venv
- source $WORK_DIR/venv/bin/activate
-
- pip install --upgrade cffi
- pip install --upgrade MarkupSafe
- pip install --upgrade pip
- pip install --upgrade cheetah
- pip install --upgrade pyyaml
- pip install --upgrade requests
- pip install --upgrade netaddr
- pip install --upgrade oslo.config
- pip install --upgrade ansible
- fi
- fi
+ sudo pip install --upgrade virtualenv
+ virtualenv $WORK_DIR/venv
+ source $WORK_DIR/venv/bin/activate
+
+ pip install --upgrade cffi
+ pip install --upgrade MarkupSafe
+ pip install --upgrade pip
+ pip install --upgrade cheetah
+ pip install --upgrade pyyaml
+ pip install --upgrade requests
+ pip install --upgrade netaddr
+ pip install --upgrade oslo.config
+ pip install --upgrade ansible
+ fi
}
function _pre_env_setup()