[CORD-2276]
Update to work with newer versions of Shade OpenStack lib
Change-Id: I4521f24fdbd31b27c93db73016dbd09c6753f2ac
diff --git a/xos/synchronizer/steps/sync_controller_images.py b/xos/synchronizer/steps/sync_controller_images.py
index 798e198..4b6bded 100644
--- a/xos/synchronizer/steps/sync_controller_images.py
+++ b/xos/synchronizer/steps/sync_controller_images.py
@@ -1,4 +1,3 @@
-
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
import os
import base64
from synchronizers.openstack.openstacksyncstep import OpenStackSyncStep
diff --git a/xos/synchronizer/steps/sync_controller_networks.yaml b/xos/synchronizer/steps/sync_controller_networks.yaml
index 33622b0..eb4f595 100644
--- a/xos/synchronizer/steps/sync_controller_networks.yaml
+++ b/xos/synchronizer/steps/sync_controller_networks.yaml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,24 +13,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
- hosts: 127.0.0.1
connection: local
tasks:
+
- os_network:
- auth:
+ auth:
auth_url: "{{ endpoint }}"
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
- name: "{{ name }}"
- shared: true
- {% if not delete -%}
- state: present
- {% else -%}
- state: absent
- {% endif -%}
+ interface: "admin"
+ name: "{{ name }}"
+ shared: true
+ {% if not delete -%}
+ state: present
+ {% else -%}
+ state: absent
+ {% endif -%}
{% if not delete %}
- os_subnet:
@@ -39,6 +39,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
+ interface: "admin"
name: "{{ subnet_name }}"
network_name: "{{ name }}"
{% if not delete -%}
diff --git a/xos/synchronizer/steps/sync_controller_sites.yaml b/xos/synchronizer/steps/sync_controller_sites.yaml
index 46ff581..4d8c13f 100644
--- a/xos/synchronizer/steps/sync_controller_sites.yaml
+++ b/xos/synchronizer/steps/sync_controller_sites.yaml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
- hosts: 127.0.0.1
connection: local
tasks:
@@ -26,6 +24,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
+ interface: "admin"
name: "{{ project }}"
description: "{{ project_description }}"
diff --git a/xos/synchronizer/steps/sync_controller_slices.yaml b/xos/synchronizer/steps/sync_controller_slices.yaml
index 3552861..2865499 100644
--- a/xos/synchronizer/steps/sync_controller_slices.yaml
+++ b/xos/synchronizer/steps/sync_controller_slices.yaml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
- hosts: 127.0.0.1
connection: local
tasks:
@@ -26,6 +24,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
+ interface: "admin"
name: "{{ project }}"
{% if delete %}
state: absent
@@ -40,6 +39,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
+ interface: "admin"
name: "{{ role }}"
- name: Create users with roles in slice
@@ -49,6 +49,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
+ interface: "admin"
user: "{{ username }}"
role: "{{ role }}"
project: "{{ project }}"
diff --git a/xos/synchronizer/steps/sync_controller_users.yaml b/xos/synchronizer/steps/sync_controller_users.yaml
index 6ee36e1..82b0b09 100644
--- a/xos/synchronizer/steps/sync_controller_users.yaml
+++ b/xos/synchronizer/steps/sync_controller_users.yaml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
- hosts: 127.0.0.1
connection: local
tasks:
@@ -26,6 +24,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
+ interface: "admin"
name: "{{ name }}"
email: "{{ email }}"
password: "{{ password }}"
@@ -37,6 +36,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
+ interface: "admin"
name: "{{ project }}"
{% for role in roles %}
@@ -47,6 +47,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ admin_project }}"
+ interface: "admin"
name: "{{ role }}"
- name: Add role "{{ role }}" to user "{{ name }}" on project "{{ project }}"
diff --git a/xos/synchronizer/steps/sync_instances.yaml b/xos/synchronizer/steps/sync_instances.yaml
index be8b81e..8557ac1 100644
--- a/xos/synchronizer/steps/sync_instances.yaml
+++ b/xos/synchronizer/steps/sync_instances.yaml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,11 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
- hosts: 127.0.0.1
connection: local
tasks:
+
- os_server:
name: "{{ name }}"
auth:
@@ -25,6 +24,7 @@
username: "{{ admin_user }}"
password: "{{ admin_password }}"
project_name: "{{ project_name }}"
+ interface: "admin"
{% if delete -%}
state: absent
{% else -%}